diff options
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index a3e40d70c071..1b79d3311e6c 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -1177,7 +1177,6 @@ static void sky2_rx_clean(struct sky2_port *sky2) | |||
1177 | re->skb = NULL; | 1177 | re->skb = NULL; |
1178 | } | 1178 | } |
1179 | } | 1179 | } |
1180 | skb_queue_purge(&sky2->rx_recycle); | ||
1181 | } | 1180 | } |
1182 | 1181 | ||
1183 | /* Basic MII support */ | 1182 | /* Basic MII support */ |
@@ -1269,10 +1268,8 @@ static struct sk_buff *sky2_rx_alloc(struct sky2_port *sky2) | |||
1269 | struct sk_buff *skb; | 1268 | struct sk_buff *skb; |
1270 | int i; | 1269 | int i; |
1271 | 1270 | ||
1272 | skb = __skb_dequeue(&sky2->rx_recycle); | 1271 | skb = netdev_alloc_skb(sky2->netdev, |
1273 | if (!skb) | 1272 | sky2->rx_data_size + sky2_rx_pad(sky2->hw)); |
1274 | skb = netdev_alloc_skb(sky2->netdev, sky2->rx_data_size | ||
1275 | + sky2_rx_pad(sky2->hw)); | ||
1276 | if (!skb) | 1273 | if (!skb) |
1277 | goto nomem; | 1274 | goto nomem; |
1278 | 1275 | ||
@@ -1364,8 +1361,6 @@ static int sky2_rx_start(struct sky2_port *sky2) | |||
1364 | 1361 | ||
1365 | sky2->rx_data_size = size; | 1362 | sky2->rx_data_size = size; |
1366 | 1363 | ||
1367 | skb_queue_head_init(&sky2->rx_recycle); | ||
1368 | |||
1369 | /* Fill Rx ring */ | 1364 | /* Fill Rx ring */ |
1370 | for (i = 0; i < sky2->rx_pending; i++) { | 1365 | for (i = 0; i < sky2->rx_pending; i++) { |
1371 | re = sky2->rx_ring + i; | 1366 | re = sky2->rx_ring + i; |
@@ -1776,12 +1771,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done) | |||
1776 | dev->stats.tx_packets++; | 1771 | dev->stats.tx_packets++; |
1777 | dev->stats.tx_bytes += skb->len; | 1772 | dev->stats.tx_bytes += skb->len; |
1778 | 1773 | ||
1779 | if (skb_queue_len(&sky2->rx_recycle) < sky2->rx_pending | 1774 | dev_kfree_skb_any(skb); |
1780 | && skb_recycle_check(skb, sky2->rx_data_size | ||
1781 | + sky2_rx_pad(sky2->hw))) | ||
1782 | __skb_queue_head(&sky2->rx_recycle, skb); | ||
1783 | else | ||
1784 | dev_kfree_skb_any(skb); | ||
1785 | 1775 | ||
1786 | sky2->tx_next = RING_NEXT(idx, sky2->tx_ring_size); | 1776 | sky2->tx_next = RING_NEXT(idx, sky2->tx_ring_size); |
1787 | } | 1777 | } |