Эх сурвалжийг харах

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>
Willem de Bruijn 10 жил өмнө
parent
commit
bbbf2df003
1 өөрчлөгдсөн 2 нэмэгдсэн , 9 устгасан
  1. 2 9
      net/core/dev.c

+ 2 - 9
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)
 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);
 		atomic_long_inc(&dev->rx_dropped);
 		kfree_skb(skb);
 		kfree_skb(skb);
 		return NET_RX_DROP;
 		return NET_RX_DROP;