mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3

Browse source 
This patch removes
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3
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>
This commit is contained in:
Claudiu Beznea 2016-09-04 20:52:20 +03:00 committed by Greg Kroah-Hartman
parent 8d3a225251
commit 17d9ff12c0
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/wlan-ng/p80211metadef.h
View file

@ -155,10 +155,6 @@
#define DIDmib_dot11smt_dot11WEPDefaultKeysTable \ #define DIDmib_dot11smt_dot11WEPDefaultKeysTable \
(P80211DID_MKSECTION(1) | \ (P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(4)) P80211DID_MKGROUP(4))
#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3 \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(4) | \
P80211DID_MKITEM(4) | 0x0c000000)
#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(_i) \ #define DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(_i) \
(P80211DID_MKSECTION(1) | \ (P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(4) | \ P80211DID_MKGROUP(4) | \

2
drivers/staging/wlan-ng/p80211req.c
View file

@ -203,7 +203,7 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev,
case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1): case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1):
case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(2): case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(2):
case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(3): case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(3):
case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3: case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(4):
if (!isget) if (!isget)
wep_change_key(wlandev, wep_change_key(wlandev,
P80211DID_ITEM(mibitem->did) - 1, P80211DID_ITEM(mibitem->did) - 1,

2
drivers/staging/wlan-ng/prism2mib.c
View file

@ -160,7 +160,7 @@ static struct mibrec mibtab[] = {
F_STA | F_WRITE, F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0, HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0,
prism2mib_wepdefaultkey}, prism2mib_wepdefaultkey},
{DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3, {DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(4),
F_STA | F_WRITE, F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0, HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0,
prism2mib_wepdefaultkey}, prism2mib_wepdefaultkey},