summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-15 15:27:14 -0700
committerEric W. Biederman <ebiederm@xmission.com>2014-03-24 15:13:35 -0700
commitfabfb91d50d65b5cb8835a231d7e2a0e7de6e539 (patch)
treef3250e4938ded2c6498d82a2881b8598428c55d6 /arch/um
parent35d499ee3a63b645f355d98dc407b22751896a43 (diff)
downloadlinux-stable-fabfb91d50d65b5cb8835a231d7e2a0e7de6e539.tar.gz
linux-stable-fabfb91d50d65b5cb8835a231d7e2a0e7de6e539.tar.bz2
linux-stable-fabfb91d50d65b5cb8835a231d7e2a0e7de6e539.zip
uml/net_kern: Call dev_consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_consume_skb_any in uml_net_start_xmit as it can be called in hard irq and other contexts. dev_consume_skb_any is used as uml_net_start_xmit typically consumes (not drops) packets. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/net_kern.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 39f186252e02..7d26d9c0b2fb 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -240,7 +240,7 @@ static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irqrestore(&lp->lock, flags);
- dev_kfree_skb(skb);
+ dev_consume_skb_any(skb);
return NETDEV_TX_OK;
}