diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-25 20:09:14 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-25 20:09:14 -0400 |
| commit | b0df3bd1e553e901ec7297267611a5db88240b38 (patch) | |
| tree | 3eceef36f96a6cf187cf8c4072fd83b4f6435315 /include/linux/netdevice.h | |
| parent | cc3afe6f856054a3752ef2b3ccc5eebf33bd5024 (diff) | |
| parent | a67ab2bde752b26be75d4b68ecead9a14692eac5 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into tmp
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index afd80eff2725..13d6d4eb8b3a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -334,7 +334,6 @@ struct net_device | |||
| 334 | 334 | ||
| 335 | 335 | ||
| 336 | struct net_device_stats* (*get_stats)(struct net_device *dev); | 336 | struct net_device_stats* (*get_stats)(struct net_device *dev); |
| 337 | struct iw_statistics* (*get_wireless_stats)(struct net_device *dev); | ||
| 338 | 337 | ||
| 339 | /* List of functions to handle Wireless Extensions (instead of ioctl). | 338 | /* List of functions to handle Wireless Extensions (instead of ioctl). |
| 340 | * See <net/iw_handler.h> for details. Jean II */ | 339 | * See <net/iw_handler.h> for details. Jean II */ |