diff options
| author | David S. Miller | 2010-05-12 09:05:35 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-05-12 09:05:35 +0200 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /drivers/net/gianfar.c | |
| parent | ar9170: fix for driver-core ABI change (diff) | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | kernel-qcow2-linux-278554bd6579206921f5d8a523649a7a57f8850d.tar.gz kernel-qcow2-linux-278554bd6579206921f5d8a523649a7a57f8850d.tar.xz kernel-qcow2-linux-278554bd6579206921f5d8a523649a7a57f8850d.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 11d8cae415e5..ea7d5ddb7760 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1705,6 +1705,7 @@ static void free_skb_resources(struct gfar_private *priv) sizeof(struct rxbd8) * priv->total_rx_ring_size, priv->tx_queue[0]->tx_bd_base, priv->tx_queue[0]->tx_bd_dma_base); + skb_queue_purge(&priv->rx_recycle); } void gfar_start(struct net_device *dev) @@ -2185,7 +2186,6 @@ static int gfar_close(struct net_device *dev) disable_napi(priv); - skb_queue_purge(&priv->rx_recycle); cancel_work_sync(&priv->reset_task); stop_gfar(dev); |