diff options
author | John W. Linville <linville@tuxdriver.com> | 2007-02-18 02:26:09 +0300 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-02-18 02:26:09 +0300 |
commit | b312362be6d9155b66f3a26d9159e0a680fbd6c5 (patch) | |
tree | 52ebaad6117abf806dab4e738d01b509839f7b12 /include | |
parent | bdcac1878c80b068d8e073c1691d4bd09ba9996d (diff) | |
parent | bb52a653eaef4aee877b2fa36de8699926f788bd (diff) | |
download | linux-b312362be6d9155b66f3a26d9159e0a680fbd6c5.tar.xz |
Merge branch 'upstream' into upstream-jgarzik
Conflicts:
net/ieee80211/softmac/ieee80211softmac_module.c
net/ieee80211/softmac/ieee80211softmac_wx.c
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/wireless.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/wireless.h b/include/linux/wireless.h index 7c269f4992eb..447c52beb691 100644 --- a/include/linux/wireless.h +++ b/include/linux/wireless.h @@ -334,7 +334,7 @@ * separate range because of collisions with other tools such as * 'mii-tool'. * We now have 32 commands, so a bit more space ;-). - * Also, all 'odd' commands are only usable by root and don't return the + * Also, all 'even' commands are only usable by root and don't return the * content of ifr/iwr to user (but you are not obliged to use the set/get * convention, just use every other two command). More details in iwpriv.c. * And I repeat : you are not forced to use them with iwpriv, but you @@ -348,7 +348,7 @@ #define SIOCIWLAST SIOCIWLASTPRIV /* 0x8BFF */ #define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST) -/* Even : get (world access), odd : set (root access) */ +/* Odd : get (world access), even : set (root access) */ #define IW_IS_SET(cmd) (!((cmd) & 0x1)) #define IW_IS_GET(cmd) ((cmd) & 0x1) |