1 files changed, 34 insertions, 32 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 21bed6c28ad4..e91e240b637e 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -5043,39 +5043,41 @@ static const struct iw_priv_args orinoco_privtab[] = {
 * 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[] = {
-        [SIOCSIWCOMMIT-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_commit,
+        STD_IW_HANDLER(SIOCSIWCOMMIT,   orinoco_ioctl_commit),
-        [SIOCGIWNAME  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getname,
+        STD_IW_HANDLER(SIOCGIWNAME,     orinoco_ioctl_getname),
-        [SIOCSIWFREQ  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfreq,
+        STD_IW_HANDLER(SIOCSIWFREQ,     orinoco_ioctl_setfreq),
-        [SIOCGIWFREQ  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfreq,
+        STD_IW_HANDLER(SIOCGIWFREQ,     orinoco_ioctl_getfreq),
-        [SIOCSIWMODE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setmode,
+        STD_IW_HANDLER(SIOCSIWMODE,     orinoco_ioctl_setmode),
-        [SIOCGIWMODE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getmode,
+        STD_IW_HANDLER(SIOCGIWMODE,     orinoco_ioctl_getmode),
-        [SIOCSIWSENS  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setsens,
+        STD_IW_HANDLER(SIOCSIWSENS,     orinoco_ioctl_setsens),
-        [SIOCGIWSENS  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getsens,
+        STD_IW_HANDLER(SIOCGIWSENS,     orinoco_ioctl_getsens),
-        [SIOCGIWRANGE -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwrange,
+        STD_IW_HANDLER(SIOCGIWRANGE,    orinoco_ioctl_getiwrange),
-        [SIOCSIWSPY   -SIOCIWFIRST] = (iw_handler) iw_handler_set_spy,
+        STD_IW_HANDLER(SIOCSIWSPY,      iw_handler_set_spy),
-        [SIOCGIWSPY   -SIOCIWFIRST] = (iw_handler) iw_handler_get_spy,
+        STD_IW_HANDLER(SIOCGIWSPY,      iw_handler_get_spy),
-        [SIOCSIWTHRSPY-SIOCIWFIRST] = (iw_handler) iw_handler_set_thrspy,
+        STD_IW_HANDLER(SIOCSIWTHRSPY,   iw_handler_set_thrspy),
-        [SIOCGIWTHRSPY-SIOCIWFIRST] = (iw_handler) iw_handler_get_thrspy,
+        STD_IW_HANDLER(SIOCGIWTHRSPY,   iw_handler_get_thrspy),
-        [SIOCSIWAP    -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setwap,
+        STD_IW_HANDLER(SIOCSIWAP,       orinoco_ioctl_setwap),
-        [SIOCGIWAP    -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getwap,
+        STD_IW_HANDLER(SIOCGIWAP,       orinoco_ioctl_getwap),
-        [SIOCSIWSCAN  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setscan,
+        STD_IW_HANDLER(SIOCSIWSCAN,     orinoco_ioctl_setscan),
-        [SIOCGIWSCAN  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getscan,
+        STD_IW_HANDLER(SIOCGIWSCAN,     orinoco_ioctl_getscan),
-        [SIOCSIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setessid,
+        STD_IW_HANDLER(SIOCSIWESSID,    orinoco_ioctl_setessid),
-        [SIOCGIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getessid,
+        STD_IW_HANDLER(SIOCGIWESSID,    orinoco_ioctl_getessid),
-        [SIOCSIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setnick,
+        STD_IW_HANDLER(SIOCSIWNICKN,    orinoco_ioctl_setnick),
-        [SIOCGIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getnick,
+        STD_IW_HANDLER(SIOCGIWNICKN,    orinoco_ioctl_getnick),
-        [SIOCSIWRATE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrate,
+        STD_IW_HANDLER(SIOCSIWRATE,     orinoco_ioctl_setrate),
-        [SIOCGIWRATE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrate,
+        STD_IW_HANDLER(SIOCGIWRATE,     orinoco_ioctl_getrate),
-        [SIOCSIWRTS   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrts,
+        STD_IW_HANDLER(SIOCSIWRTS,      orinoco_ioctl_setrts),
-        [SIOCGIWRTS   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrts,
+        STD_IW_HANDLER(SIOCGIWRTS,      orinoco_ioctl_getrts),
-        [SIOCSIWFRAG  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfrag,
+        STD_IW_HANDLER(SIOCSIWFRAG,     orinoco_ioctl_setfrag),
-        [SIOCGIWFRAG  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfrag,
+        STD_IW_HANDLER(SIOCGIWFRAG,     orinoco_ioctl_getfrag),
-        [SIOCGIWRETRY -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getretry,
+        STD_IW_HANDLER(SIOCGIWRETRY,    orinoco_ioctl_getretry),
-        [SIOCSIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setiwencode,
+        STD_IW_HANDLER(SIOCSIWENCODE,   orinoco_ioctl_setiwencode),
-        [SIOCGIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwencode,
+        STD_IW_HANDLER(SIOCGIWENCODE,   orinoco_ioctl_getiwencode),
-        [SIOCSIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setpower,
+        STD_IW_HANDLER(SIOCSIWPOWER,    orinoco_ioctl_setpower),
-        [SIOCGIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getpower,
+        STD_IW_HANDLER(SIOCGIWPOWER,    orinoco_ioctl_getpower),
 };

diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 21bed6c28ad4..e91e240b637e 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c
@@ -5043,39 +5043,41 @@ static const struct iw_priv_args orinoco_privtab[] = {
5043	* Structures to export the Wireless Handlers	5043	* Structures to export the Wireless Handlers
5044	*/	5044	*/
5045		5045
		5046	#define STD_IW_HANDLER(id, func) \
		5047	[IW_IOCTL_IDX(id)] = (iw_handler) func
5046	static const iw_handler orinoco_handler[] = {	5048	static const iw_handler orinoco_handler[] = {
5047	[SIOCSIWCOMMIT-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_commit,	5049	STD_IW_HANDLER(SIOCSIWCOMMIT, orinoco_ioctl_commit),
5048	[SIOCGIWNAME -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getname,	5050	STD_IW_HANDLER(SIOCGIWNAME, orinoco_ioctl_getname),
5049	[SIOCSIWFREQ -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfreq,	5051	STD_IW_HANDLER(SIOCSIWFREQ, orinoco_ioctl_setfreq),
5050	[SIOCGIWFREQ -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfreq,	5052	STD_IW_HANDLER(SIOCGIWFREQ, orinoco_ioctl_getfreq),
5051	[SIOCSIWMODE -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setmode,	5053	STD_IW_HANDLER(SIOCSIWMODE, orinoco_ioctl_setmode),
5052	[SIOCGIWMODE -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getmode,	5054	STD_IW_HANDLER(SIOCGIWMODE, orinoco_ioctl_getmode),
5053	[SIOCSIWSENS -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setsens,	5055	STD_IW_HANDLER(SIOCSIWSENS, orinoco_ioctl_setsens),
5054	[SIOCGIWSENS -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getsens,	5056	STD_IW_HANDLER(SIOCGIWSENS, orinoco_ioctl_getsens),
5055	[SIOCGIWRANGE -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwrange,	5057	STD_IW_HANDLER(SIOCGIWRANGE, orinoco_ioctl_getiwrange),
5056	[SIOCSIWSPY -SIOCIWFIRST] = (iw_handler) iw_handler_set_spy,	5058	STD_IW_HANDLER(SIOCSIWSPY, iw_handler_set_spy),
5057	[SIOCGIWSPY -SIOCIWFIRST] = (iw_handler) iw_handler_get_spy,	5059	STD_IW_HANDLER(SIOCGIWSPY, iw_handler_get_spy),
5058	[SIOCSIWTHRSPY-SIOCIWFIRST] = (iw_handler) iw_handler_set_thrspy,	5060	STD_IW_HANDLER(SIOCSIWTHRSPY, iw_handler_set_thrspy),
5059	[SIOCGIWTHRSPY-SIOCIWFIRST] = (iw_handler) iw_handler_get_thrspy,	5061	STD_IW_HANDLER(SIOCGIWTHRSPY, iw_handler_get_thrspy),
5060	[SIOCSIWAP -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setwap,	5062	STD_IW_HANDLER(SIOCSIWAP, orinoco_ioctl_setwap),
5061	[SIOCGIWAP -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getwap,	5063	STD_IW_HANDLER(SIOCGIWAP, orinoco_ioctl_getwap),
5062	[SIOCSIWSCAN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setscan,	5064	STD_IW_HANDLER(SIOCSIWSCAN, orinoco_ioctl_setscan),
5063	[SIOCGIWSCAN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getscan,	5065	STD_IW_HANDLER(SIOCGIWSCAN, orinoco_ioctl_getscan),
5064	[SIOCSIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setessid,	5066	STD_IW_HANDLER(SIOCSIWESSID, orinoco_ioctl_setessid),
5065	[SIOCGIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getessid,	5067	STD_IW_HANDLER(SIOCGIWESSID, orinoco_ioctl_getessid),
5066	[SIOCSIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setnick,	5068	STD_IW_HANDLER(SIOCSIWNICKN, orinoco_ioctl_setnick),
5067	[SIOCGIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getnick,	5069	STD_IW_HANDLER(SIOCGIWNICKN, orinoco_ioctl_getnick),
5068	[SIOCSIWRATE -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrate,	5070	STD_IW_HANDLER(SIOCSIWRATE, orinoco_ioctl_setrate),
5069	[SIOCGIWRATE -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrate,	5071	STD_IW_HANDLER(SIOCGIWRATE, orinoco_ioctl_getrate),
5070	[SIOCSIWRTS -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrts,	5072	STD_IW_HANDLER(SIOCSIWRTS, orinoco_ioctl_setrts),
5071	[SIOCGIWRTS -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrts,	5073	STD_IW_HANDLER(SIOCGIWRTS, orinoco_ioctl_getrts),
5072	[SIOCSIWFRAG -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfrag,	5074	STD_IW_HANDLER(SIOCSIWFRAG, orinoco_ioctl_setfrag),
5073	[SIOCGIWFRAG -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfrag,	5075	STD_IW_HANDLER(SIOCGIWFRAG, orinoco_ioctl_getfrag),
5074	[SIOCGIWRETRY -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getretry,	5076	STD_IW_HANDLER(SIOCGIWRETRY, orinoco_ioctl_getretry),
5075	[SIOCSIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setiwencode,	5077	STD_IW_HANDLER(SIOCSIWENCODE, orinoco_ioctl_setiwencode),
5076	[SIOCGIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwencode,	5078	STD_IW_HANDLER(SIOCGIWENCODE, orinoco_ioctl_getiwencode),
5077	[SIOCSIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setpower,	5079	STD_IW_HANDLER(SIOCSIWPOWER, orinoco_ioctl_setpower),
5078	[SIOCGIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getpower,	5080	STD_IW_HANDLER(SIOCGIWPOWER, orinoco_ioctl_getpower),
5079	};	5081	};
5080		5082
5081		5083