kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: r8188eu: use IW_HANDLER to declare wext handlers

Browse source 
Use the IW_HANDLER macro to declare the handler functions for
wext ioctls. We don't have to skip unused ioctl numbers manually.

The same modification was applied to the deprecated rtl8188eu driver in
commit af249fce39 ("staging: rtl8188eu: use IW_HANDLER to declare wext
handlers").

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210807153636.11712-11-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Kaiser 2021-08-07 17:36:34 +02:00 • committed by Greg Kroah-Hartman
parent a8357683db
commit da2aa1ecad
1 changed files with 40 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

96
drivers/staging/r8188eu/os_dep/ioctl_linux.c
View file

@ -7426,62 +7426,46 @@ static int rtw_test(
}
static iw_handler rtw_handlers[] = {
NULL, /* SIOCSIWCOMMIT */
rtw_wx_get_name, /* SIOCGIWNAME */
dummy, /* SIOCSIWNWID */
dummy, /* SIOCGIWNWID */
NULL, /* SIOCSIWFREQ */
rtw_wx_get_freq, /* SIOCGIWFREQ */
rtw_wx_set_mode, /* SIOCSIWMODE */
rtw_wx_get_mode, /* SIOCGIWMODE */
dummy, /* SIOCSIWSENS */
rtw_wx_get_sens, /* SIOCGIWSENS */
NULL, /* SIOCSIWRANGE */
rtw_wx_get_range, /* SIOCGIWRANGE */
rtw_wx_set_priv, /* SIOCSIWPRIV */
NULL, /* SIOCGIWPRIV */
NULL, /* SIOCSIWSTATS */
NULL, /* SIOCGIWSTATS */
dummy, /* SIOCSIWSPY */
dummy, /* SIOCGIWSPY */
NULL, /* SIOCGIWTHRSPY */
NULL, /* SIOCWIWTHRSPY */
rtw_wx_set_wap, /* SIOCSIWAP */
rtw_wx_get_wap, /* SIOCGIWAP */
rtw_wx_set_mlme, /* request MLME operation; uses struct iw_mlme */
dummy, /* SIOCGIWAPLIST -- depricated */
rtw_wx_set_scan, /* SIOCSIWSCAN */
rtw_wx_get_scan, /* SIOCGIWSCAN */
rtw_wx_set_essid, /* SIOCSIWESSID */
rtw_wx_get_essid, /* SIOCGIWESSID */
dummy, /* SIOCSIWNICKN */
rtw_wx_get_nick, /* SIOCGIWNICKN */
NULL, /* -- hole -- */
NULL, /* -- hole -- */
rtw_wx_set_rate, /* SIOCSIWRATE */
rtw_wx_get_rate, /* SIOCGIWRATE */
rtw_wx_set_rts, /* SIOCSIWRTS */
rtw_wx_get_rts, /* SIOCGIWRTS */
rtw_wx_set_frag, /* SIOCSIWFRAG */
rtw_wx_get_frag, /* SIOCGIWFRAG */
dummy, /* SIOCSIWTXPOW */
dummy, /* SIOCGIWTXPOW */
dummy, /* SIOCSIWRETRY */
rtw_wx_get_retry, /* SIOCGIWRETRY */
rtw_wx_set_enc, /* SIOCSIWENCODE */
rtw_wx_get_enc, /* SIOCGIWENCODE */
dummy, /* SIOCSIWPOWER */
rtw_wx_get_power, /* SIOCGIWPOWER */
NULL, /*---hole---*/
NULL, /*---hole---*/
rtw_wx_set_gen_ie, /* SIOCSIWGENIE */
NULL, /* SIOCGWGENIE */
rtw_wx_set_auth, /* SIOCSIWAUTH */
NULL, /* SIOCGIWAUTH */
rtw_wx_set_enc_ext, /* SIOCSIWENCODEEXT */
NULL, /* SIOCGIWENCODEEXT */
rtw_wx_set_pmkid, /* SIOCSIWPMKSA */
NULL, /*---hole---*/
IW_HANDLER(SIOCGIWNAME, rtw_wx_get_name),
IW_HANDLER(SIOCSIWNWID, dummy),
IW_HANDLER(SIOCGIWNWID, dummy),
IW_HANDLER(SIOCGIWFREQ, rtw_wx_get_freq),
IW_HANDLER(SIOCSIWMODE, rtw_wx_set_mode),
IW_HANDLER(SIOCGIWMODE, rtw_wx_get_mode),
IW_HANDLER(SIOCSIWSENS, dummy),
IW_HANDLER(SIOCGIWSENS, rtw_wx_get_sens),
IW_HANDLER(SIOCGIWRANGE, rtw_wx_get_range),
IW_HANDLER(SIOCSIWPRIV, rtw_wx_set_priv),
IW_HANDLER(SIOCSIWSPY, dummy),
IW_HANDLER(SIOCGIWSPY, dummy),
IW_HANDLER(SIOCSIWAP, rtw_wx_set_wap),
IW_HANDLER(SIOCGIWAP, rtw_wx_get_wap),
IW_HANDLER(SIOCSIWMLME, rtw_wx_set_mlme),
IW_HANDLER(SIOCGIWAPLIST, dummy),
IW_HANDLER(SIOCSIWSCAN, rtw_wx_set_scan),
IW_HANDLER(SIOCGIWSCAN, rtw_wx_get_scan),
IW_HANDLER(SIOCSIWESSID, rtw_wx_set_essid),
IW_HANDLER(SIOCGIWESSID, rtw_wx_get_essid),
IW_HANDLER(SIOCSIWNICKN, dummy),
IW_HANDLER(SIOCGIWNICKN, rtw_wx_get_nick),
IW_HANDLER(SIOCSIWRATE, rtw_wx_set_rate),
IW_HANDLER(SIOCGIWRATE, rtw_wx_get_rate),
IW_HANDLER(SIOCSIWRTS, rtw_wx_set_rts),
IW_HANDLER(SIOCGIWRTS, rtw_wx_get_rts),
IW_HANDLER(SIOCSIWFRAG, rtw_wx_set_frag),
IW_HANDLER(SIOCGIWFRAG, rtw_wx_get_frag),
IW_HANDLER(SIOCSIWTXPOW, dummy),
IW_HANDLER(SIOCGIWTXPOW, dummy),
IW_HANDLER(SIOCSIWRETRY, dummy),
IW_HANDLER(SIOCGIWRETRY, rtw_wx_get_retry),
IW_HANDLER(SIOCSIWENCODE, rtw_wx_set_enc),
IW_HANDLER(SIOCGIWENCODE, rtw_wx_get_enc),
IW_HANDLER(SIOCSIWPOWER, dummy),
IW_HANDLER(SIOCGIWPOWER, rtw_wx_get_power),
IW_HANDLER(SIOCSIWGENIE, rtw_wx_set_gen_ie),
IW_HANDLER(SIOCSIWAUTH, rtw_wx_set_auth),
IW_HANDLER(SIOCSIWENCODEEXT, rtw_wx_set_enc_ext),
IW_HANDLER(SIOCSIWPMKSA, rtw_wx_set_pmkid),
};
static const struct iw_priv_args rtw_private_args[] = {