diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-28 17:50:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-28 17:50:06 -0400 |
| commit | eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0 (patch) | |
| tree | ee5e1e52ef663e1a4d19c7abd6477a8ed75fda41 /include | |
| parent | 47379052b5c87707bc6e20a2a4f6ac156fb8357c (diff) | |
| parent | a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/wext.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/wext.h b/include/net/wext.h index 6d76a39a9c5b..3f2b94de2cfa 100644 --- a/include/net/wext.h +++ b/include/net/wext.h | |||
| @@ -14,6 +14,7 @@ extern int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cm | |||
| 14 | void __user *arg); | 14 | void __user *arg); |
| 15 | extern int compat_wext_handle_ioctl(struct net *net, unsigned int cmd, | 15 | extern int compat_wext_handle_ioctl(struct net *net, unsigned int cmd, |
| 16 | unsigned long arg); | 16 | unsigned long arg); |
| 17 | extern struct iw_statistics *get_wireless_stats(struct net_device *dev); | ||
| 17 | #else | 18 | #else |
| 18 | static inline int wext_proc_init(struct net *net) | 19 | static inline int wext_proc_init(struct net *net) |
| 19 | { | 20 | { |