adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

wext: Pass iwreq pointer down into standard/private handlers.

Browse source 
They have no need to see the object as an ifreq.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2007-12-21 03:46:01 -08:00 committed by David S. Miller
parent ca1e8bb8e4
commit d291125559
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
net/wireless/wext.c
View file

@ -832,11 +832,10 @@ out:
* user space and kernel space.
*/
static int ioctl_standard_call(struct net_device * dev,
struct ifreq * ifr,
struct iwreq *iwr,
unsigned int cmd,
iw_handler handler)
{
struct iwreq * iwr = (struct iwreq *) ifr;
const struct iw_ioctl_description * descr;
struct iw_request_info info;
int ret = -EINVAL;
@ -984,10 +983,9 @@ out:
return err;
}
static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
static int ioctl_private_call(struct net_device *dev, struct iwreq *iwr,
unsigned int cmd, iw_handler handler)
{
struct iwreq *iwr = (struct iwreq *) ifr;
int extra_size = 0, ret = -EINVAL;
const struct iw_priv_args *descr;
struct iw_request_info info;
@ -1015,7 +1013,7 @@ static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
}
/* ---------------------------------------------------------------- */
typedef int (*wext_ioctl_func)(struct net_device *, struct ifreq *,
typedef int (*wext_ioctl_func)(struct net_device *, struct iwreq *,
unsigned int, iw_handler);
/*
@ -1027,6 +1025,7 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
wext_ioctl_func standard,
wext_ioctl_func private)
{
struct iwreq *iwr = (struct iwreq *) ifr;
struct net_device *dev;
iw_handler handler;
@ -1041,11 +1040,11 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
* Note that 'cmd' is already filtered in dev_ioctl() with
* (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */
if (cmd == SIOCGIWSTATS)
return standard(dev, ifr, cmd,
return standard(dev, iwr, cmd,
&iw_handler_get_iwstats);
if (cmd == SIOCGIWPRIV && dev->wireless_handlers)
return standard(dev, ifr, cmd,
return standard(dev, iwr, cmd,
&iw_handler_get_private);
/* Basic check */
@ -1057,9 +1056,9 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
if (handler) {
/* Standard and private are not the same */
if (cmd < SIOCIWFIRSTPRIV)
return standard(dev, ifr, cmd, handler);
return standard(dev, iwr, cmd, handler);
else
return private(dev, ifr, cmd, handler);
return private(dev, iwr, cmd, handler);
}
/* Old driver API : call driver ioctl handler */
if (dev->do_ioctl)