aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2008-12-17 16:50:22 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-17 16:50:22 -0800
commit8882d9a60028a9937e9c5652cfb80d4399ce5242 (patch)
treed39f493014cc3c3959617ef78d003a72668c5cbe /drivers/net/gianfar.c
parenta693722aec4ce26fb46c21cf4bf4422484a397a7 (diff)
gianfar: Fix packet drop when out of memory
The patch which fixed gianfar so it drops packets when it runs out of memory left in the code which frees the skb when it drops packets. Change the code so that we only free the skb if the new skb was successfully created. Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 3e611a69df1..a6efabc28dc 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1732,8 +1732,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
if (unlikely(!newskb))
newskb = skb;
-
- if (skb)
+ else if (skb)
dev_kfree_skb_any(skb);
} else {
/* Increment the number of packets */