Commit adc009e2 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville

orinoco/wext.c: Remove local #define STD_IW_HANDLER

Use IW_HANDLER from wireless.h instead
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 56b632e8
...@@ -1505,46 +1505,44 @@ static const struct iw_priv_args orinoco_privtab[] = { ...@@ -1505,46 +1505,44 @@ static const struct iw_priv_args orinoco_privtab[] = {
* Structures to export the Wireless Handlers * Structures to export the Wireless Handlers
*/ */
#define STD_IW_HANDLER(id, func) \
[IW_IOCTL_IDX(id)] = (iw_handler) func
static const iw_handler orinoco_handler[] = { static const iw_handler orinoco_handler[] = {
STD_IW_HANDLER(SIOCSIWCOMMIT, orinoco_ioctl_commit), IW_HANDLER(SIOCSIWCOMMIT, (iw_handler)orinoco_ioctl_commit),
STD_IW_HANDLER(SIOCGIWNAME, cfg80211_wext_giwname), IW_HANDLER(SIOCGIWNAME, (iw_handler)cfg80211_wext_giwname),
STD_IW_HANDLER(SIOCSIWFREQ, orinoco_ioctl_setfreq), IW_HANDLER(SIOCSIWFREQ, (iw_handler)orinoco_ioctl_setfreq),
STD_IW_HANDLER(SIOCGIWFREQ, orinoco_ioctl_getfreq), IW_HANDLER(SIOCGIWFREQ, (iw_handler)orinoco_ioctl_getfreq),
STD_IW_HANDLER(SIOCSIWMODE, cfg80211_wext_siwmode), IW_HANDLER(SIOCSIWMODE, (iw_handler)cfg80211_wext_siwmode),
STD_IW_HANDLER(SIOCGIWMODE, cfg80211_wext_giwmode), IW_HANDLER(SIOCGIWMODE, (iw_handler)cfg80211_wext_giwmode),
STD_IW_HANDLER(SIOCSIWSENS, orinoco_ioctl_setsens), IW_HANDLER(SIOCSIWSENS, (iw_handler)orinoco_ioctl_setsens),
STD_IW_HANDLER(SIOCGIWSENS, orinoco_ioctl_getsens), IW_HANDLER(SIOCGIWSENS, (iw_handler)orinoco_ioctl_getsens),
STD_IW_HANDLER(SIOCGIWRANGE, cfg80211_wext_giwrange), IW_HANDLER(SIOCGIWRANGE, (iw_handler)cfg80211_wext_giwrange),
STD_IW_HANDLER(SIOCSIWSPY, iw_handler_set_spy), IW_HANDLER(SIOCSIWSPY, iw_handler_set_spy),
STD_IW_HANDLER(SIOCGIWSPY, iw_handler_get_spy), IW_HANDLER(SIOCGIWSPY, iw_handler_get_spy),
STD_IW_HANDLER(SIOCSIWTHRSPY, iw_handler_set_thrspy), IW_HANDLER(SIOCSIWTHRSPY, iw_handler_set_thrspy),
STD_IW_HANDLER(SIOCGIWTHRSPY, iw_handler_get_thrspy), IW_HANDLER(SIOCGIWTHRSPY, iw_handler_get_thrspy),
STD_IW_HANDLER(SIOCSIWAP, orinoco_ioctl_setwap), IW_HANDLER(SIOCSIWAP, (iw_handler)orinoco_ioctl_setwap),
STD_IW_HANDLER(SIOCGIWAP, orinoco_ioctl_getwap), IW_HANDLER(SIOCGIWAP, (iw_handler)orinoco_ioctl_getwap),
STD_IW_HANDLER(SIOCSIWSCAN, cfg80211_wext_siwscan), IW_HANDLER(SIOCSIWSCAN, (iw_handler)cfg80211_wext_siwscan),
STD_IW_HANDLER(SIOCGIWSCAN, cfg80211_wext_giwscan), IW_HANDLER(SIOCGIWSCAN, (iw_handler)cfg80211_wext_giwscan),
STD_IW_HANDLER(SIOCSIWESSID, orinoco_ioctl_setessid), IW_HANDLER(SIOCSIWESSID, (iw_handler)orinoco_ioctl_setessid),
STD_IW_HANDLER(SIOCGIWESSID, orinoco_ioctl_getessid), IW_HANDLER(SIOCGIWESSID, (iw_handler)orinoco_ioctl_getessid),
STD_IW_HANDLER(SIOCSIWRATE, orinoco_ioctl_setrate), IW_HANDLER(SIOCSIWRATE, (iw_handler)orinoco_ioctl_setrate),
STD_IW_HANDLER(SIOCGIWRATE, orinoco_ioctl_getrate), IW_HANDLER(SIOCGIWRATE, (iw_handler)orinoco_ioctl_getrate),
STD_IW_HANDLER(SIOCSIWRTS, orinoco_ioctl_setrts), IW_HANDLER(SIOCSIWRTS, (iw_handler)orinoco_ioctl_setrts),
STD_IW_HANDLER(SIOCGIWRTS, orinoco_ioctl_getrts), IW_HANDLER(SIOCGIWRTS, (iw_handler)orinoco_ioctl_getrts),
STD_IW_HANDLER(SIOCSIWFRAG, orinoco_ioctl_setfrag), IW_HANDLER(SIOCSIWFRAG, (iw_handler)orinoco_ioctl_setfrag),
STD_IW_HANDLER(SIOCGIWFRAG, orinoco_ioctl_getfrag), IW_HANDLER(SIOCGIWFRAG, (iw_handler)orinoco_ioctl_getfrag),
STD_IW_HANDLER(SIOCGIWRETRY, orinoco_ioctl_getretry), IW_HANDLER(SIOCGIWRETRY, (iw_handler)orinoco_ioctl_getretry),
STD_IW_HANDLER(SIOCSIWENCODE, orinoco_ioctl_setiwencode), IW_HANDLER(SIOCSIWENCODE, (iw_handler)orinoco_ioctl_setiwencode),
STD_IW_HANDLER(SIOCGIWENCODE, orinoco_ioctl_getiwencode), IW_HANDLER(SIOCGIWENCODE, (iw_handler)orinoco_ioctl_getiwencode),
STD_IW_HANDLER(SIOCSIWPOWER, orinoco_ioctl_setpower), IW_HANDLER(SIOCSIWPOWER, (iw_handler)orinoco_ioctl_setpower),
STD_IW_HANDLER(SIOCGIWPOWER, orinoco_ioctl_getpower), IW_HANDLER(SIOCGIWPOWER, (iw_handler)orinoco_ioctl_getpower),
STD_IW_HANDLER(SIOCSIWGENIE, orinoco_ioctl_set_genie), IW_HANDLER(SIOCSIWGENIE, orinoco_ioctl_set_genie),
STD_IW_HANDLER(SIOCGIWGENIE, orinoco_ioctl_get_genie), IW_HANDLER(SIOCGIWGENIE, orinoco_ioctl_get_genie),
STD_IW_HANDLER(SIOCSIWMLME, orinoco_ioctl_set_mlme), IW_HANDLER(SIOCSIWMLME, orinoco_ioctl_set_mlme),
STD_IW_HANDLER(SIOCSIWAUTH, orinoco_ioctl_set_auth), IW_HANDLER(SIOCSIWAUTH, orinoco_ioctl_set_auth),
STD_IW_HANDLER(SIOCGIWAUTH, orinoco_ioctl_get_auth), IW_HANDLER(SIOCGIWAUTH, orinoco_ioctl_get_auth),
STD_IW_HANDLER(SIOCSIWENCODEEXT, orinoco_ioctl_set_encodeext), IW_HANDLER(SIOCSIWENCODEEXT, orinoco_ioctl_set_encodeext),
STD_IW_HANDLER(SIOCGIWENCODEEXT, orinoco_ioctl_get_encodeext), IW_HANDLER(SIOCGIWENCODEEXT, orinoco_ioctl_get_encodeext),
}; };
...@@ -1552,15 +1550,15 @@ static const iw_handler orinoco_handler[] = { ...@@ -1552,15 +1550,15 @@ static const iw_handler orinoco_handler[] = {
Added typecasting since we no longer use iwreq_data -- Moustafa Added typecasting since we no longer use iwreq_data -- Moustafa
*/ */
static const iw_handler orinoco_private_handler[] = { static const iw_handler orinoco_private_handler[] = {
[0] = (iw_handler) orinoco_ioctl_reset, [0] = (iw_handler)orinoco_ioctl_reset,
[1] = (iw_handler) orinoco_ioctl_reset, [1] = (iw_handler)orinoco_ioctl_reset,
[2] = (iw_handler) orinoco_ioctl_setport3, [2] = (iw_handler)orinoco_ioctl_setport3,
[3] = (iw_handler) orinoco_ioctl_getport3, [3] = (iw_handler)orinoco_ioctl_getport3,
[4] = (iw_handler) orinoco_ioctl_setpreamble, [4] = (iw_handler)orinoco_ioctl_setpreamble,
[5] = (iw_handler) orinoco_ioctl_getpreamble, [5] = (iw_handler)orinoco_ioctl_getpreamble,
[6] = (iw_handler) orinoco_ioctl_setibssport, [6] = (iw_handler)orinoco_ioctl_setibssport,
[7] = (iw_handler) orinoco_ioctl_getibssport, [7] = (iw_handler)orinoco_ioctl_getibssport,
[9] = (iw_handler) orinoco_ioctl_getrid, [9] = (iw_handler)orinoco_ioctl_getrid,
}; };
const struct iw_handler_def orinoco_handler_def = { const struct iw_handler_def orinoco_handler_def = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment