Commit 17d9ff12 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro... 


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

This patch removes
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3
macro and uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key()
instead.

Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d3a2252

drivers/staging/wlan-ng/p80211metadef.h

+0 −4
Original line number Diff line number Diff line
@@ -155,10 +155,6 @@ 
#define DIDmib_dot11smt_dot11WEPDefaultKeysTable \

			(P80211DID_MKSECTION(1) | \

			P80211DID_MKGROUP(4))

#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3 \

			(P80211DID_MKSECTION(1) | \

			P80211DID_MKGROUP(4) | \

			P80211DID_MKITEM(4) | 0x0c000000)

#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(_i) \

			(P80211DID_MKSECTION(1) | \

			P80211DID_MKGROUP(4) | \

drivers/staging/wlan-ng/p80211req.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev, 
	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1):

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(2):

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(3):

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3:

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(4):

		if (!isget)

			wep_change_key(wlandev,

				       P80211DID_ITEM(mibitem->did) - 1,

drivers/staging/wlan-ng/prism2mib.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static struct mibrec mibtab[] = { 
	 F_STA | F_WRITE,

	 HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0,

	 prism2mib_wepdefaultkey},

	{DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3,

	{DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(4),

	 F_STA | F_WRITE,

	 HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0,

	 prism2mib_wepdefaultkey},

CRA Git | Maintained and supported by SUSTech CRA and CCSE