diff options
author | Claudiu Beznea <claudiu.beznea@gmail.com> | 2016-09-04 17:52:18 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-12 11:19:10 (GMT) |
commit | 41e9b844cc8ec2c7a747aec52706f3312878395f (patch) | |
tree | d18db05a2d97dbacf90910eb91ffa9426e92ccfa /drivers/staging | |
parent | 152f04483dcce4b8d7a7c82689e8917196d84921 (diff) | |
download | linux-41e9b844cc8ec2c7a747aec52706f3312878395f.tar.xz |
Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1
This patch removes
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1
macro and uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key()
instead.
Signed-off-by: Claudiu Beznea <claudiu.beznea@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/wlan-ng/p80211metadef.h | 4 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211req.c | 2 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/prism2mib.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 9a7fa8e..c15ed08 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -155,10 +155,6 @@ #define DIDmib_dot11smt_dot11WEPDefaultKeysTable \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(4)) -#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1 \ - (P80211DID_MKSECTION(1) | \ - P80211DID_MKGROUP(4) | \ - P80211DID_MKITEM(2) | 0x0c000000) #define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2 \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(4) | \ diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c index c7325fa..c1ad57f 100644 --- a/drivers/staging/wlan-ng/p80211req.c +++ b/drivers/staging/wlan-ng/p80211req.c @@ -201,7 +201,7 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev, switch (mibitem->did) { case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1): - case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1: + case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(2): case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2: case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3: if (!isget) diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c index 5fcfc81..7887f2aa 100644 --- a/drivers/staging/wlan-ng/prism2mib.c +++ b/drivers/staging/wlan-ng/prism2mib.c @@ -152,7 +152,7 @@ static struct mibrec mibtab[] = { F_STA | F_WRITE, HFA384x_RID_CNFWEPDEFAULTKEY0, 0, 0, prism2mib_wepdefaultkey}, - {DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1, + {DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(2), F_STA | F_WRITE, HFA384x_RID_CNFWEPDEFAULTKEY1, 0, 0, prism2mib_wepdefaultkey}, |