Skip to content

Commit

Permalink
wext: Pull top-level ioctl dispatch logic into helper function.
Browse files Browse the repository at this point in the history
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jun 17, 2008
1 parent d291125 commit a67fa76
Showing 1 changed file with 20 additions and 6 deletions.
26 changes: 20 additions & 6 deletions net/wireless/wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -1079,8 +1079,10 @@ static int wext_permission_check(unsigned int cmd)
}

/* entry point from dev ioctl */
int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
void __user *arg)
static int wext_ioctl_dispatch(struct net *net, struct ifreq *ifr,
unsigned int cmd,
wext_ioctl_func standard,
wext_ioctl_func private)
{
int ret = wext_permission_check(cmd);

Expand All @@ -1089,12 +1091,24 @@ int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,

dev_load(net, ifr->ifr_name);
rtnl_lock();
ret = wireless_process_ioctl(net, ifr, cmd,
ioctl_standard_call,
ioctl_private_call);
ret = wireless_process_ioctl(net, ifr, cmd, standard, private);
rtnl_unlock();
if (IW_IS_GET(cmd) && copy_to_user(arg, ifr, sizeof(struct iwreq)))

return ret;
}

int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
void __user *arg)
{
int ret = wext_ioctl_dispatch(net, ifr, cmd,
ioctl_standard_call,
ioctl_private_call);

if (ret >= 0 &&
IW_IS_GET(cmd) &&
copy_to_user(arg, ifr, sizeof(struct iwreq)))
return -EFAULT;

return ret;
}

Expand Down

0 comments on commit a67fa76

Please sign in to comment.