lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jesse Gross
2011-01-09 06:23:33 +00:00
committed by David S. Miller
parent fc741216db
commit 91ecb63c07
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/core/dev.c
View File

@ -1971,16 +1971,14 @@ static void dev_gso_skb_destructor(struct sk_buff *skb)
/** /**
* dev_gso_segment - Perform emulated hardware segmentation on skb. * dev_gso_segment - Perform emulated hardware segmentation on skb.
* @skb: buffer to segment * @skb: buffer to segment
* @features: device features as applicable to this skb
* *
* This function segments the given skb and stores the list of segments * This function segments the given skb and stores the list of segments
* in skb->next. * 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; struct sk_buff *segs;
int features = dev->features & ~(illegal_highdma(dev, skb) ?
NETIF_F_SG : 0);
segs = skb_gso_segment(skb, features); 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 (netif_needs_gso(skb, features)) {
if (unlikely(dev_gso_segment(skb))) if (unlikely(dev_gso_segment(skb, features)))
goto out_kfree_skb; goto out_kfree_skb;
if (skb->next) if (skb->next)
goto gso; goto gso;