diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-19 00:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-19 00:03:51 -0400 |
| commit | 4b153ca989a9bf61f622ded32e1d689df88edaa5 (patch) | |
| tree | 9f11467ff9b8899bd69ed71fd9dd2ade83ba876e /include | |
| parent | 46f8cd9d2fc1e4e8b82b53a0007f6c92e80c930b (diff) | |
| parent | 68dd02d19c811ca8ea60220a9d73e13b4bdad73a (diff) | |
| download | linux-4b153ca989a9bf61f622ded32e1d689df88edaa5.tar.bz2 | |
Merge tag 'mac80211-for-davem-2017-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Here's just the fix for that ancient bug:
* remove wext calling ndo_do_ioctl, since nobody needs
that now and it makes the type change easier
* use struct iwreq instead of struct ifreq almost everywhere
in wireless extensions code
* copy only struct iwreq from userspace in dev_ioctl for the
wireless extensions, since it's smaller than struct ifreq
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/wext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/wext.h b/include/net/wext.h index 345911965dbb..454ff763eeba 100644 --- a/include/net/wext.h +++ b/include/net/wext.h @@ -6,7 +6,7 @@ struct net; #ifdef CONFIG_WEXT_CORE -int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, +int wext_handle_ioctl(struct net *net, struct iwreq *iwr, unsigned int cmd, void __user *arg); int compat_wext_handle_ioctl(struct net *net, unsigned int cmd, unsigned long arg); @@ -14,7 +14,7 @@ int compat_wext_handle_ioctl(struct net *net, unsigned int cmd, struct iw_statistics *get_wireless_stats(struct net_device *dev); int call_commit_handler(struct net_device *dev); #else -static inline int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, +static inline int wext_handle_ioctl(struct net *net, struct iwreq *iwr, unsigned int cmd, void __user *arg) { return -EINVAL; |