diff options
| author | Jesse Gross <jesse@nicira.com> | 2011-01-09 06:23:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-09 23:35:34 -0800 |
| commit | 91ecb63c074d802f8cf103f1dafb4aed24d0f24c (patch) | |
| tree | b35dd6b8de64ceeeee22dad0ee8f2794a662d401 /net/core | |
| parent | fc741216db156994c554ac31c1151fe0e00d8f0e (diff) | |
| download | linux-91ecb63c074d802f8cf103f1dafb4aed24d0f24c.tar.gz linux-91ecb63c074d802f8cf103f1dafb4aed24d0f24c.tar.bz2 linux-91ecb63c074d802f8cf103f1dafb4aed24d0f24c.zip | |
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: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 1444ed3861a0..4cd3e84e1294 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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; |