diff options
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1a528548cd1d..e027a3750a77 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -42,6 +42,8 @@ | |||
42 | struct vlan_group; | 42 | struct vlan_group; |
43 | struct ethtool_ops; | 43 | struct ethtool_ops; |
44 | struct netpoll_info; | 44 | struct netpoll_info; |
45 | /* 802.11 specific */ | ||
46 | struct wireless_dev; | ||
45 | /* source back-compat hooks */ | 47 | /* source back-compat hooks */ |
46 | #define SET_ETHTOOL_OPS(netdev,ops) \ | 48 | #define SET_ETHTOOL_OPS(netdev,ops) \ |
47 | ( (netdev)->ethtool_ops = (ops) ) | 49 | ( (netdev)->ethtool_ops = (ops) ) |
@@ -323,6 +325,7 @@ struct net_device | |||
323 | #define NETIF_F_VLAN_CHALLENGED 1024 /* Device cannot handle VLAN packets */ | 325 | #define NETIF_F_VLAN_CHALLENGED 1024 /* Device cannot handle VLAN packets */ |
324 | #define NETIF_F_GSO 2048 /* Enable software GSO. */ | 326 | #define NETIF_F_GSO 2048 /* Enable software GSO. */ |
325 | #define NETIF_F_LLTX 4096 /* LockLess TX */ | 327 | #define NETIF_F_LLTX 4096 /* LockLess TX */ |
328 | #define NETIF_F_INTERNAL_STATS 8192 /* Use stats structure in net_device */ | ||
326 | 329 | ||
327 | /* Segmentation offload features */ | 330 | /* Segmentation offload features */ |
328 | #define NETIF_F_GSO_SHIFT 16 | 331 | #define NETIF_F_GSO_SHIFT 16 |
@@ -347,13 +350,15 @@ struct net_device | |||
347 | 350 | ||
348 | 351 | ||
349 | struct net_device_stats* (*get_stats)(struct net_device *dev); | 352 | struct net_device_stats* (*get_stats)(struct net_device *dev); |
353 | struct net_device_stats stats; | ||
350 | 354 | ||
355 | #ifdef CONFIG_WIRELESS_EXT | ||
351 | /* List of functions to handle Wireless Extensions (instead of ioctl). | 356 | /* List of functions to handle Wireless Extensions (instead of ioctl). |
352 | * See <net/iw_handler.h> for details. Jean II */ | 357 | * See <net/iw_handler.h> for details. Jean II */ |
353 | const struct iw_handler_def * wireless_handlers; | 358 | const struct iw_handler_def * wireless_handlers; |
354 | /* Instance data managed by the core of Wireless Extensions. */ | 359 | /* Instance data managed by the core of Wireless Extensions. */ |
355 | struct iw_public_data * wireless_data; | 360 | struct iw_public_data * wireless_data; |
356 | 361 | #endif | |
357 | const struct ethtool_ops *ethtool_ops; | 362 | const struct ethtool_ops *ethtool_ops; |
358 | 363 | ||
359 | /* | 364 | /* |
@@ -398,6 +403,8 @@ struct net_device | |||
398 | void *ip6_ptr; /* IPv6 specific data */ | 403 | void *ip6_ptr; /* IPv6 specific data */ |
399 | void *ec_ptr; /* Econet specific data */ | 404 | void *ec_ptr; /* Econet specific data */ |
400 | void *ax25_ptr; /* AX.25 specific data */ | 405 | void *ax25_ptr; /* AX.25 specific data */ |
406 | struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, | ||
407 | assign before registering */ | ||
401 | 408 | ||
402 | /* | 409 | /* |
403 | * Cache line mostly used on receive path (including eth_type_trans()) | 410 | * Cache line mostly used on receive path (including eth_type_trans()) |