Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219996
b: refs/heads/master
c: 1f1f19f
h: refs/heads/master
v: v3
  • Loading branch information
Mike McCormack authored and Greg Kroah-Hartman committed Sep 30, 2010
1 parent 99c5a20 commit 846745c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 067ba6cf6c09b14057f6b8999933fd5780d68a25
refs/heads/master: 1f1f19ff628ac3936f88465efb07efde0a4e5a5a
46 changes: 18 additions & 28 deletions trunk/drivers/staging/rtl8192e/r8192E_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1598,41 +1598,31 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev,
return 0;
}


static short rtl8192_pci_initdescring(struct net_device *dev)
{
u32 ret;
int i;
struct r8192_priv *priv = ieee80211_priv(dev);

ret = rtl8192_alloc_rx_desc_ring(dev);
if (ret) {
return ret;
}

u32 ret;
int i;
struct r8192_priv *priv = ieee80211_priv(dev);

/* 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;
}
ret = rtl8192_alloc_rx_desc_ring(dev);
if (ret)
return ret;

#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
/* 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;
}

return 0;
return 0;

err_free_rings:
rtl8192_free_rx_ring(dev);
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
if (priv->tx_ring[i].desc)
rtl8192_free_tx_ring(dev, i);
return 1;
rtl8192_free_rx_ring(dev);
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
if (priv->tx_ring[i].desc)
rtl8192_free_tx_ring(dev, i);
return 1;
}

static void rtl8192_pci_resetdescring(struct net_device *dev)
Expand Down

0 comments on commit 846745c

Please sign in to comment.