Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b86a61d authored Apr 17, 2015 by Johannes Berg Committed by David S. Miller Apr 17, 2015

net: remove unused 'dev' argument from netif_needs_gso()



In commit 04ffcb25 ("net: Add ndo_gso_check") Tom originally
added the 'dev' argument to be able to call ndo_gso_check().

Then later, when generalizing this in commit 5f35227e
("net: Generalize ndo_gso_check to ndo_features_check")
Jesse removed the call to ndo_gso_check() in netif_needs_gso()
by calling the new ndo_features_check() in a different place.
This made the 'dev' argument unused.

Remove the unused argument and go back to the code as before.

Cc: Tom Herbert <therbert@google.com>
Cc: Jesse Gross <jesse@nicira.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f40ae913

drivers/net/macvtap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -313,7 +313,7 @@ static rx_handler_result_t macvtap_handle_frame(struct sk_buff **pskb)
		*/
		if (q->flags & IFF_VNET_HDR)
		features \|= vlan->tap_features;
		if (netif_needs_gso(dev, skb, features)) {
		if (netif_needs_gso(skb, features)) {
		struct sk_buff *segs = __skb_gso_segment(skb, features, false);

		if (IS_ERR(segs))

drivers/net/xen-netfront.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -560,7 +560,7 @@ static int xennet_start_xmit(struct sk_buff skb, struct net_device dev)

		if (unlikely(!netif_carrier_ok(dev) \|\|
		(slots > 1 && !xennet_can_sg(dev)) \|\|
		netif_needs_gso(dev, skb, netif_skb_features(skb)))) {
		netif_needs_gso(skb, netif_skb_features(skb)))) {
		spin_unlock_irqrestore(&queue->tx_lock, flags);
		goto drop;
		}

include/linux/netdevice.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3713,7 +3713,7 @@ static inline bool skb_gso_ok(struct sk_buff *skb, netdev_features_t features)
		(!skb_has_frag_list(skb) \|\| (features & NETIF_F_FRAGLIST));
		}

		static inline bool netif_needs_gso(struct net_device dev, struct sk_buff skb,
		static inline bool netif_needs_gso(struct sk_buff *skb,
		netdev_features_t features)
		{
		return skb_is_gso(skb) && (!skb_gso_ok(skb, features) \|\|

net/core/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2713,7 +2713,7 @@ static struct sk_buff validate_xmit_skb(struct sk_buff skb, struct net_device
		if (unlikely(!skb))
		goto out_null;

		if (netif_needs_gso(dev, skb, features)) {
		if (netif_needs_gso(skb, features)) {
		struct sk_buff *segs;

		segs = skb_gso_segment(skb, features);