Commit 1f1f19ff authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman

Staging: rtl8192e: Clean up rtl8192_pci_initdescring()

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 067ba6cf
...@@ -1598,41 +1598,31 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev, ...@@ -1598,41 +1598,31 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev,
return 0; return 0;
} }
static short rtl8192_pci_initdescring(struct net_device *dev) static short rtl8192_pci_initdescring(struct net_device *dev)
{ {
u32 ret; u32 ret;
int i; int i;
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
ret = rtl8192_alloc_rx_desc_ring(dev);
if (ret) {
return ret;
}
/* general process for other queue */ ret = rtl8192_alloc_rx_desc_ring(dev);
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) { if (ret)
ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount); return ret;
if (ret)
goto err_free_rings;
}
#if 0 /* general process for other queue */
/* specific process for hardware beacon process */ for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) {
ret = rtl8192_alloc_tx_desc_ring(dev, MAX_TX_QUEUE_COUNT - 1, 2); ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount);
if (ret) if (ret)
goto err_free_rings; goto err_free_rings;
#endif }
return 0; return 0;
err_free_rings: err_free_rings:
rtl8192_free_rx_ring(dev); rtl8192_free_rx_ring(dev);
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
if (priv->tx_ring[i].desc) if (priv->tx_ring[i].desc)
rtl8192_free_tx_ring(dev, i); rtl8192_free_tx_ring(dev, i);
return 1; return 1;
} }
static void rtl8192_pci_resetdescring(struct net_device *dev) static void rtl8192_pci_resetdescring(struct net_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment