diff options
-rw-r--r-- | drivers/net/macvtap.c | 2 | ||||
-rw-r--r-- | drivers/net/xen-netfront.c | 2 | ||||
-rw-r--r-- | include/linux/netdevice.h | 2 | ||||
-rw-r--r-- | net/core/dev.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 8362aef0c15e..58c6ba5746d5 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c | |||
@@ -313,7 +313,7 @@ static rx_handler_result_t macvtap_handle_frame(struct sk_buff **pskb) | |||
313 | */ | 313 | */ |
314 | if (q->flags & IFF_VNET_HDR) | 314 | if (q->flags & IFF_VNET_HDR) |
315 | features |= vlan->tap_features; | 315 | features |= vlan->tap_features; |
316 | if (netif_needs_gso(dev, skb, features)) { | 316 | if (netif_needs_gso(skb, features)) { |
317 | struct sk_buff *segs = __skb_gso_segment(skb, features, false); | 317 | struct sk_buff *segs = __skb_gso_segment(skb, features, false); |
318 | 318 | ||
319 | if (IS_ERR(segs)) | 319 | if (IS_ERR(segs)) |
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 720aaf6313d2..8dcf31063e9a 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -560,7 +560,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
560 | 560 | ||
561 | if (unlikely(!netif_carrier_ok(dev) || | 561 | if (unlikely(!netif_carrier_ok(dev) || |
562 | (slots > 1 && !xennet_can_sg(dev)) || | 562 | (slots > 1 && !xennet_can_sg(dev)) || |
563 | netif_needs_gso(dev, skb, netif_skb_features(skb)))) { | 563 | netif_needs_gso(skb, netif_skb_features(skb)))) { |
564 | spin_unlock_irqrestore(&queue->tx_lock, flags); | 564 | spin_unlock_irqrestore(&queue->tx_lock, flags); |
565 | goto drop; | 565 | goto drop; |
566 | } | 566 | } |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b5679aed660b..bcbde799ec69 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -3713,7 +3713,7 @@ static inline bool skb_gso_ok(struct sk_buff *skb, netdev_features_t features) | |||
3713 | (!skb_has_frag_list(skb) || (features & NETIF_F_FRAGLIST)); | 3713 | (!skb_has_frag_list(skb) || (features & NETIF_F_FRAGLIST)); |
3714 | } | 3714 | } |
3715 | 3715 | ||
3716 | static inline bool netif_needs_gso(struct net_device *dev, struct sk_buff *skb, | 3716 | static inline bool netif_needs_gso(struct sk_buff *skb, |
3717 | netdev_features_t features) | 3717 | netdev_features_t features) |
3718 | { | 3718 | { |
3719 | return skb_is_gso(skb) && (!skb_gso_ok(skb, features) || | 3719 | return skb_is_gso(skb) && (!skb_gso_ok(skb, features) || |
diff --git a/net/core/dev.c b/net/core/dev.c index af4a1b0adc10..1796cef55ab5 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2713,7 +2713,7 @@ static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device | |||
2713 | if (unlikely(!skb)) | 2713 | if (unlikely(!skb)) |
2714 | goto out_null; | 2714 | goto out_null; |
2715 | 2715 | ||
2716 | if (netif_needs_gso(dev, skb, features)) { | 2716 | if (netif_needs_gso(skb, features)) { |
2717 | struct sk_buff *segs; | 2717 | struct sk_buff *segs; |
2718 | 2718 | ||
2719 | segs = skb_gso_segment(skb, features); | 2719 | segs = skb_gso_segment(skb, features); |