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 <>
Signed-off-by: default avatarDavid S. Miller <>
parent fc741216
......@@ -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;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment