aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-03-18 21:29:39 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-03-23 16:50:28 -0400
commitadc009e2e76b222006beb7f9df6d0aee051509d2 (patch)
tree3e554b3cd5d42bddaefaf300cd1d8a3e1957ab67 /drivers
parent56b632e8cc7a13cece861d890deb2843116f9372 (diff)
orinoco/wext.c: Remove local #define STD_IW_HANDLER
Use IW_HANDLER from wireless.h instead Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/orinoco/wext.c94
1 files changed, 46 insertions, 48 deletions
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index 31ca241f7753..29f9bc03190a 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -1505,46 +1505,44 @@ static const struct iw_priv_args orinoco_privtab[] = {
1505 * Structures to export the Wireless Handlers 1505 * Structures to export the Wireless Handlers
1506 */ 1506 */
1507 1507
1508#define STD_IW_HANDLER(id, func) \
1509 [IW_IOCTL_IDX(id)] = (iw_handler) func
1510static const iw_handler orinoco_handler[] = { 1508static const iw_handler orinoco_handler[] = {
1511 STD_IW_HANDLER(SIOCSIWCOMMIT, orinoco_ioctl_commit), 1509 IW_HANDLER(SIOCSIWCOMMIT, (iw_handler)orinoco_ioctl_commit),
1512 STD_IW_HANDLER(SIOCGIWNAME, cfg80211_wext_giwname), 1510 IW_HANDLER(SIOCGIWNAME, (iw_handler)cfg80211_wext_giwname),
1513 STD_IW_HANDLER(SIOCSIWFREQ, orinoco_ioctl_setfreq), 1511 IW_HANDLER(SIOCSIWFREQ, (iw_handler)orinoco_ioctl_setfreq),
1514 STD_IW_HANDLER(SIOCGIWFREQ, orinoco_ioctl_getfreq), 1512 IW_HANDLER(SIOCGIWFREQ, (iw_handler)orinoco_ioctl_getfreq),
1515 STD_IW_HANDLER(SIOCSIWMODE, cfg80211_wext_siwmode), 1513 IW_HANDLER(SIOCSIWMODE, (iw_handler)cfg80211_wext_siwmode),
1516 STD_IW_HANDLER(SIOCGIWMODE, cfg80211_wext_giwmode), 1514 IW_HANDLER(SIOCGIWMODE, (iw_handler)cfg80211_wext_giwmode),
1517 STD_IW_HANDLER(SIOCSIWSENS, orinoco_ioctl_setsens), 1515 IW_HANDLER(SIOCSIWSENS, (iw_handler)orinoco_ioctl_setsens),
1518 STD_IW_HANDLER(SIOCGIWSENS, orinoco_ioctl_getsens), 1516 IW_HANDLER(SIOCGIWSENS, (iw_handler)orinoco_ioctl_getsens),
1519 STD_IW_HANDLER(SIOCGIWRANGE, cfg80211_wext_giwrange), 1517 IW_HANDLER(SIOCGIWRANGE, (iw_handler)cfg80211_wext_giwrange),
1520 STD_IW_HANDLER(SIOCSIWSPY, iw_handler_set_spy), 1518 IW_HANDLER(SIOCSIWSPY, iw_handler_set_spy),
1521 STD_IW_HANDLER(SIOCGIWSPY, iw_handler_get_spy), 1519 IW_HANDLER(SIOCGIWSPY, iw_handler_get_spy),
1522 STD_IW_HANDLER(SIOCSIWTHRSPY, iw_handler_set_thrspy), 1520 IW_HANDLER(SIOCSIWTHRSPY, iw_handler_set_thrspy),
1523 STD_IW_HANDLER(SIOCGIWTHRSPY, iw_handler_get_thrspy), 1521 IW_HANDLER(SIOCGIWTHRSPY, iw_handler_get_thrspy),
1524 STD_IW_HANDLER(SIOCSIWAP, orinoco_ioctl_setwap), 1522 IW_HANDLER(SIOCSIWAP, (iw_handler)orinoco_ioctl_setwap),
1525 STD_IW_HANDLER(SIOCGIWAP, orinoco_ioctl_getwap), 1523 IW_HANDLER(SIOCGIWAP, (iw_handler)orinoco_ioctl_getwap),
1526 STD_IW_HANDLER(SIOCSIWSCAN, cfg80211_wext_siwscan), 1524 IW_HANDLER(SIOCSIWSCAN, (iw_handler)cfg80211_wext_siwscan),
1527 STD_IW_HANDLER(SIOCGIWSCAN, cfg80211_wext_giwscan), 1525 IW_HANDLER(SIOCGIWSCAN, (iw_handler)cfg80211_wext_giwscan),
1528 STD_IW_HANDLER(SIOCSIWESSID, orinoco_ioctl_setessid), 1526 IW_HANDLER(SIOCSIWESSID, (iw_handler)orinoco_ioctl_setessid),
1529 STD_IW_HANDLER(SIOCGIWESSID, orinoco_ioctl_getessid), 1527 IW_HANDLER(SIOCGIWESSID, (iw_handler)orinoco_ioctl_getessid),
1530 STD_IW_HANDLER(SIOCSIWRATE, orinoco_ioctl_setrate), 1528 IW_HANDLER(SIOCSIWRATE, (iw_handler)orinoco_ioctl_setrate),
1531 STD_IW_HANDLER(SIOCGIWRATE, orinoco_ioctl_getrate), 1529 IW_HANDLER(SIOCGIWRATE, (iw_handler)orinoco_ioctl_getrate),
1532 STD_IW_HANDLER(SIOCSIWRTS, orinoco_ioctl_setrts), 1530 IW_HANDLER(SIOCSIWRTS, (iw_handler)orinoco_ioctl_setrts),
1533 STD_IW_HANDLER(SIOCGIWRTS, orinoco_ioctl_getrts), 1531 IW_HANDLER(SIOCGIWRTS, (iw_handler)orinoco_ioctl_getrts),
1534 STD_IW_HANDLER(SIOCSIWFRAG, orinoco_ioctl_setfrag), 1532 IW_HANDLER(SIOCSIWFRAG, (iw_handler)orinoco_ioctl_setfrag),
1535 STD_IW_HANDLER(SIOCGIWFRAG, orinoco_ioctl_getfrag), 1533 IW_HANDLER(SIOCGIWFRAG, (iw_handler)orinoco_ioctl_getfrag),
1536 STD_IW_HANDLER(SIOCGIWRETRY, orinoco_ioctl_getretry), 1534 IW_HANDLER(SIOCGIWRETRY, (iw_handler)orinoco_ioctl_getretry),
1537 STD_IW_HANDLER(SIOCSIWENCODE, orinoco_ioctl_setiwencode), 1535 IW_HANDLER(SIOCSIWENCODE, (iw_handler)orinoco_ioctl_setiwencode),
1538 STD_IW_HANDLER(SIOCGIWENCODE, orinoco_ioctl_getiwencode), 1536 IW_HANDLER(SIOCGIWENCODE, (iw_handler)orinoco_ioctl_getiwencode),
1539 STD_IW_HANDLER(SIOCSIWPOWER, orinoco_ioctl_setpower), 1537 IW_HANDLER(SIOCSIWPOWER, (iw_handler)orinoco_ioctl_setpower),
1540 STD_IW_HANDLER(SIOCGIWPOWER, orinoco_ioctl_getpower), 1538 IW_HANDLER(SIOCGIWPOWER, (iw_handler)orinoco_ioctl_getpower),
1541 STD_IW_HANDLER(SIOCSIWGENIE, orinoco_ioctl_set_genie), 1539 IW_HANDLER(SIOCSIWGENIE, orinoco_ioctl_set_genie),
1542 STD_IW_HANDLER(SIOCGIWGENIE, orinoco_ioctl_get_genie), 1540 IW_HANDLER(SIOCGIWGENIE, orinoco_ioctl_get_genie),
1543 STD_IW_HANDLER(SIOCSIWMLME, orinoco_ioctl_set_mlme), 1541 IW_HANDLER(SIOCSIWMLME, orinoco_ioctl_set_mlme),
1544 STD_IW_HANDLER(SIOCSIWAUTH, orinoco_ioctl_set_auth), 1542 IW_HANDLER(SIOCSIWAUTH, orinoco_ioctl_set_auth),
1545 STD_IW_HANDLER(SIOCGIWAUTH, orinoco_ioctl_get_auth), 1543 IW_HANDLER(SIOCGIWAUTH, orinoco_ioctl_get_auth),
1546 STD_IW_HANDLER(SIOCSIWENCODEEXT, orinoco_ioctl_set_encodeext), 1544 IW_HANDLER(SIOCSIWENCODEEXT, orinoco_ioctl_set_encodeext),
1547 STD_IW_HANDLER(SIOCGIWENCODEEXT, orinoco_ioctl_get_encodeext), 1545 IW_HANDLER(SIOCGIWENCODEEXT, orinoco_ioctl_get_encodeext),
1548}; 1546};
1549 1547
1550 1548
@@ -1552,15 +1550,15 @@ static const iw_handler orinoco_handler[] = {
1552 Added typecasting since we no longer use iwreq_data -- Moustafa 1550 Added typecasting since we no longer use iwreq_data -- Moustafa
1553 */ 1551 */
1554static const iw_handler orinoco_private_handler[] = { 1552static const iw_handler orinoco_private_handler[] = {
1555 [0] = (iw_handler) orinoco_ioctl_reset, 1553 [0] = (iw_handler)orinoco_ioctl_reset,
1556 [1] = (iw_handler) orinoco_ioctl_reset, 1554 [1] = (iw_handler)orinoco_ioctl_reset,
1557 [2] = (iw_handler) orinoco_ioctl_setport3, 1555 [2] = (iw_handler)orinoco_ioctl_setport3,
1558 [3] = (iw_handler) orinoco_ioctl_getport3, 1556 [3] = (iw_handler)orinoco_ioctl_getport3,
1559 [4] = (iw_handler) orinoco_ioctl_setpreamble, 1557 [4] = (iw_handler)orinoco_ioctl_setpreamble,
1560 [5] = (iw_handler) orinoco_ioctl_getpreamble, 1558 [5] = (iw_handler)orinoco_ioctl_getpreamble,
1561 [6] = (iw_handler) orinoco_ioctl_setibssport, 1559 [6] = (iw_handler)orinoco_ioctl_setibssport,
1562 [7] = (iw_handler) orinoco_ioctl_getibssport, 1560 [7] = (iw_handler)orinoco_ioctl_getibssport,
1563 [9] = (iw_handler) orinoco_ioctl_getrid, 1561 [9] = (iw_handler)orinoco_ioctl_getrid,
1564}; 1562};
1565 1563
1566const struct iw_handler_def orinoco_handler_def = { 1564const struct iw_handler_def orinoco_handler_def = {
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-15 16:26:23 -0500