diff options
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index a4b14fd81c6a..0cf9448a32c4 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -901,7 +901,7 @@ struct net_device { | |||
901 | 901 | ||
902 | unsigned int flags; /* interface flags (a la BSD) */ | 902 | unsigned int flags; /* interface flags (a la BSD) */ |
903 | unsigned short gflags; | 903 | unsigned short gflags; |
904 | unsigned short priv_flags; /* Like 'flags' but invisible to userspace. */ | 904 | unsigned int priv_flags; /* Like 'flags' but invisible to userspace. */ |
905 | unsigned short padded; /* How much padding added by alloc_netdev() */ | 905 | unsigned short padded; /* How much padding added by alloc_netdev() */ |
906 | 906 | ||
907 | unsigned char operstate; /* RFC2863 operstate */ | 907 | unsigned char operstate; /* RFC2863 operstate */ |
@@ -2193,7 +2193,7 @@ static inline int net_gso_ok(int features, int gso_type) | |||
2193 | static inline int skb_gso_ok(struct sk_buff *skb, int features) | 2193 | static inline int skb_gso_ok(struct sk_buff *skb, int features) |
2194 | { | 2194 | { |
2195 | return net_gso_ok(features, skb_shinfo(skb)->gso_type) && | 2195 | return net_gso_ok(features, skb_shinfo(skb)->gso_type) && |
2196 | (!skb_has_frags(skb) || (features & NETIF_F_FRAGLIST)); | 2196 | (!skb_has_frag_list(skb) || (features & NETIF_F_FRAGLIST)); |
2197 | } | 2197 | } |
2198 | 2198 | ||
2199 | static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb) | 2199 | static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb) |