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

Commit 91ecb63c authored by Jesse Gross's avatar Jesse Gross Committed by David S. Miller
Browse files

net offloading: Convert dev_gso_segment() to use precomputed features. 



This switches dev_gso_segment() to use the device features computed
by the centralized routine.  In doing so, it fixes a problem where
it would always use dev->features, instead of those appropriate
to the number of vlan tags if any are present.

Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc741216

net/core/dev.c

+3 −5
Original line number Diff line number Diff line
@@ -1971,16 +1971,14 @@ static void dev_gso_skb_destructor(struct sk_buff *skb) 
/**

 *	dev_gso_segment - Perform emulated hardware segmentation on skb.

 *	@skb: buffer to segment

 *	@features: device features as applicable to this skb

 *

 *	This function segments the given skb and stores the list of segments

 *	in skb->next.

 */

static int dev_gso_segment(struct sk_buff *skb)

static int dev_gso_segment(struct sk_buff *skb, int features)

{

	struct net_device *dev = skb->dev;

	struct sk_buff *segs;

	int features = dev->features & ~(illegal_highdma(dev, skb) ?

					 NETIF_F_SG : 0);



	segs = skb_gso_segment(skb, features);
@@ -2112,7 +2110,7 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, 
		}



		if (netif_needs_gso(skb, features)) {

			if (unlikely(dev_gso_segment(skb)))

			if (unlikely(dev_gso_segment(skb, features)))

				goto out_kfree_skb;

			if (skb->next)

				goto gso;