leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: rtl8192e: Clean up rtl8192_pci_initdescring()

Browse Source 
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack 2010-09-24 18:39:41 +09:00 committed by Greg Kroah-Hartman
parent 067ba6cf6c
commit 1f1f19ff62
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/staging/rtl8192e/r8192E_core.c
View File

@ -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); ret = rtl8192_alloc_rx_desc_ring(dev);
if (ret) { if (ret)
return ret; return ret;
}
/* general process for other queue */
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) {
ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount);
if (ret)
goto err_free_rings;
}
/* general process for other queue */ return 0;
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) {
ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount);
if (ret)
goto err_free_rings;
}
#if 0
/* specific process for hardware beacon process */
ret = rtl8192_alloc_tx_desc_ring(dev, MAX_TX_QUEUE_COUNT - 1, 2);
if (ret)
goto err_free_rings;
#endif
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)