diff options
| author | Willem de Bruijn <willemb@google.com> | 2015-06-08 17:53:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-08 21:15:13 +0200 |
| commit | bbbf2df0039d31c6a0a9708ce4fe220a54bd5379 (patch) | |
| tree | 1b6fe886986a7621b4028db18b7fe262ea6ebf97 | |
| parent | net: bcmgenet: power on MII block for all MII modes (diff) | |
| download | linux-bbbf2df0039d31c6a0a9708ce4fe220a54bd5379.tar.xz linux-bbbf2df0039d31c6a0a9708ce4fe220a54bd5379.zip | |
net: replace last open coded skb_orphan_frags with function call
Commit 70008aa50e92 ("skbuff: convert to skb_orphan_frags") replaced
open coded tests of SKBTX_DEV_ZEROCOPY and skb_copy_ubufs with calls
to helper function skb_orphan_frags. Apply that to the last remaining
open coded site.
Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 2c1c67fad64d..aa82f9ab6a36 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1718,15 +1718,8 @@ EXPORT_SYMBOL_GPL(is_skb_forwardable); int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb) { - if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) { - if (skb_copy_ubufs(skb, GFP_ATOMIC)) { - atomic_long_inc(&dev->rx_dropped); - kfree_skb(skb); - return NET_RX_DROP; - } - } - - if (unlikely(!is_skb_forwardable(dev, skb))) { + if (skb_orphan_frags(skb, GFP_ATOMIC) || + unlikely(!is_skb_forwardable(dev, skb))) { atomic_long_inc(&dev->rx_dropped); kfree_skb(skb); return NET_RX_DROP; |