Skip to content

Commit

Permalink
net offloading: Convert dev_gso_segment() to use precomputed features.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
jessegross authored and davem330 committed Jan 10, 2011
1 parent fc74121 commit 91ecb63
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions net/core/dev.c
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 91ecb63

Please sign in to comment.