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

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>

diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h
index 33b743c596ae8df755ddf40e08947e093148b0f8..33de0413212b1d1bb94b20431091d565add20a04 100644 (file)
--- 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_dot11WEPDefaultKey3 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(4) | \
-                       P80211DID_MKITEM(4) | 0x0c000000)
 #define DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(_i) \
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(4) | \

diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index 27292eabd13c4da1601ea4b43e39b85fb085298c..f755318c165370db4733bcc0c1d0737e654428cf 100644 (file)
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -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,

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 6bc7bece47b7c841c6914e4d811085fe41fef050..524271f5b7f1432fb60df1399b7fd4279049590b 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -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},