diff options
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b11e6e19e96c..25f87102ab66 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -88,6 +88,8 @@ struct wireless_dev; | |||
88 | #define NETDEV_TX_BUSY 1 /* driver tx path was busy*/ | 88 | #define NETDEV_TX_BUSY 1 /* driver tx path was busy*/ |
89 | #define NETDEV_TX_LOCKED -1 /* driver tx lock was already taken */ | 89 | #define NETDEV_TX_LOCKED -1 /* driver tx lock was already taken */ |
90 | 90 | ||
91 | #ifdef __KERNEL__ | ||
92 | |||
91 | /* | 93 | /* |
92 | * Compute the worst case header length according to the protocols | 94 | * Compute the worst case header length according to the protocols |
93 | * used. | 95 | * used. |
@@ -114,6 +116,8 @@ struct wireless_dev; | |||
114 | #define MAX_HEADER (LL_MAX_HEADER + 48) | 116 | #define MAX_HEADER (LL_MAX_HEADER + 48) |
115 | #endif | 117 | #endif |
116 | 118 | ||
119 | #endif /* __KERNEL__ */ | ||
120 | |||
117 | struct net_device_subqueue | 121 | struct net_device_subqueue |
118 | { | 122 | { |
119 | /* Give a control state for each queue. This struct may contain | 123 | /* Give a control state for each queue. This struct may contain |
@@ -745,6 +749,9 @@ struct net_device | |||
745 | /* rtnetlink link ops */ | 749 | /* rtnetlink link ops */ |
746 | const struct rtnl_link_ops *rtnl_link_ops; | 750 | const struct rtnl_link_ops *rtnl_link_ops; |
747 | 751 | ||
752 | /* VLAN feature mask */ | ||
753 | unsigned long vlan_features; | ||
754 | |||
748 | /* for setting kernel sock attribute on TCP connection setup */ | 755 | /* for setting kernel sock attribute on TCP connection setup */ |
749 | #define GSO_MAX_SIZE 65536 | 756 | #define GSO_MAX_SIZE 65536 |
750 | unsigned int gso_max_size; | 757 | unsigned int gso_max_size; |