Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 409644a9 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: Use a macro to define wireless handlers 



The macro identifiers for the various ioctls required for WPA support
are longer than those currently used by the driver. This makes it messy
to keep line length below 80 character.

By defining a macro to initialise the handler table, we recover the
common text.

Signed-off-by: default avatarDavid Kilroy <kilroyd@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6cd90b1c

drivers/net/wireless/orinoco.c

+34 −32
Original line number Original line Diff line number Diff line
@@ -5043,39 +5043,41 @@ 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[] = {

	[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),

};

};