diff options
| author | Jesse Gross <jesse@nicira.com> | 2011-01-09 06:23:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-09 23:35:34 -0800 |
| commit | fc741216db156994c554ac31c1151fe0e00d8f0e (patch) | |
| tree | 692c6278f1c20e4452620adee1ea3cd05d878819 /include | |
| parent | f01a5236bd4b140198fbcc550f085e8361fd73fa (diff) | |
| download | blackbird-op-linux-fc741216db156994c554ac31c1151fe0e00d8f0e.tar.gz blackbird-op-linux-fc741216db156994c554ac31c1151fe0e00d8f0e.zip | |
net offloading: Pass features into netif_needs_gso().
Now that there is a single function that can compute the device
features relevant to a packet, we don't want to run it for each
offload. This converts netif_needs_gso() to take the features
of the device, rather than computing them itself.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d4dac09a5ad2..de2bfe6da359 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2317,16 +2317,10 @@ static inline int skb_gso_ok(struct sk_buff *skb, int features) (!skb_has_frag_list(skb) || (features & NETIF_F_FRAGLIST)); } -static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb) +static inline int netif_needs_gso(struct sk_buff *skb, int features) { - if (skb_is_gso(skb)) { - int features = netif_skb_features(skb); - - return (!skb_gso_ok(skb, features) || - unlikely(skb->ip_summed != CHECKSUM_PARTIAL)); - } - - return 0; + return skb_is_gso(skb) && (!skb_gso_ok(skb, features) || + unlikely(skb->ip_summed != CHECKSUM_PARTIAL)); } static inline void netif_set_gso_max_size(struct net_device *dev, |
