diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-27 15:41:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-29 17:58:37 -0400 |
| commit | 080b3c19a4ffe4677d7449880f4d0cea07182474 (patch) | |
| tree | 27705e68d54e29f2c9356d07fca45562b201f290 /net/core/netpoll.c | |
| parent | 66b5552fc2dfbaa6445b1bdadd10c9305ce261bd (diff) | |
| download | linux-stable-080b3c19a4ffe4677d7449880f4d0cea07182474.tar.gz linux-stable-080b3c19a4ffe4677d7449880f4d0cea07182474.tar.bz2 linux-stable-080b3c19a4ffe4677d7449880f4d0cea07182474.zip | |
netpoll: Remove strong unnecessary assumptions about skbs
Remove the assumption that the skbs that make it to
netpoll_send_skb_on_dev are allocated with find_skb, such that
skb->users == 1 and nothing is attached that would prevent the skbs from
being freed from hard irq context.
Remove this assumption by replacing __kfree_skb on error paths with
dev_kfree_skb_irq (in hard irq context) and kfree_skb (in process
context).
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 9fd88875faff..d44af2306f23 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -112,7 +112,7 @@ static void queue_process(struct work_struct *work) struct netdev_queue *txq; if (!netif_device_present(dev) || !netif_running(dev)) { - __kfree_skb(skb); + kfree_skb(skb); continue; } @@ -332,7 +332,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, npinfo = rcu_dereference_bh(np->dev->npinfo); if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) { - __kfree_skb(skb); + dev_kfree_skb_irq(skb); return; } |