Keep one macro instead of 4 for wep keys

PATCH New Claudiu Beznea 1 participant 6 messages Sep 4, 2016 Staging

Share & tools

Claudiu Beznea

author

2016-09-04 17:52 UTC #0 lore raw

cover Keep one macro instead of 4 for wep keys

This patchset removes DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey<#> and uses the new macro DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() instead.

Claudiu Beznea (5):
Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key()
macro instead of
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0
Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key()
macro instead of
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1
Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key()
macro instead of
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2
Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key()
macro instead of
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3
Staging: wlan-ng: changed definition of
DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro

 drivers/staging/wlan-ng/p80211metadef.h | 19 +------------------
 drivers/staging/wlan-ng/p80211req.c     |  8 ++++----
 drivers/staging/wlan-ng/prism2mib.c     |  8 ++++----
 3 files changed, 9 insertions(+), 26 deletions(-)

Signature · 1 line

1.9.1

Claudiu Beznea

author

2016-09-04 17:52 UTC #1 lore raw

PATCH 1/5 Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0

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

Signed-off-by Claudiu Beznea <[email protected]>

---
 drivers/staging/wlan-ng/p80211metadef.h | 4 ----
 drivers/staging/wlan-ng/p80211req.c     | 2 +-
 drivers/staging/wlan-ng/prism2mib.c     | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

drivers/staging/wlan-ng/p80211metadef.h +0 -4

index 98fda3d..9a7fa8e 100644
@@ -155,10 +155,6 @@
 #define DIDmib_dot11smt_dot11WEPDefaultKeysTable \
 			(P80211DID_MKSECTION(1) | \
 			P80211DID_MKGROUP(4))
-#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0 \
-			(P80211DID_MKSECTION(1) | \
-			P80211DID_MKGROUP(4) | \
-			P80211DID_MKITEM(1) | 0x0c000000)
 #define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1 \
 			(P80211DID_MKSECTION(1) | \
 			P80211DID_MKGROUP(4) | \

drivers/staging/wlan-ng/p80211req.c +1 -1

index 5c2b801..c7325fa 100644
@@ -200,7 +200,7 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev,
 	u8 *key = mibitem->data + sizeof(p80211pstrd_t);
 
 	switch (mibitem->did) {
-	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0:
+	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1):
 	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1:
 	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2:
 	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3:

drivers/staging/wlan-ng/prism2mib.c +1 -1

index fe914b1..55eb2bb 100644
@@ -148,7 +148,7 @@ static int prism2mib_priv(struct mibrec *mib,
 static struct mibrec mibtab[] = {
 
 	/* dot11smt MIB's */
-	{DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0,
+	{DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1),
 	 F_STA | F_WRITE,
 	 HFA384x_RID_CNFWEPDEFAULTKEY0, 0, 0,
 	 prism2mib_wepdefaultkey},

Signature · 1 line

1.9.1

Claudiu Beznea

author

2016-09-04 17:53 UTC #2 lore raw

PATCH 2/5 Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1

In reply to Claudiu Beznea

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

Signed-off-by Claudiu Beznea <[email protected]>

---
 drivers/staging/wlan-ng/p80211metadef.h | 4 ----
 drivers/staging/wlan-ng/p80211req.c     | 2 +-
 drivers/staging/wlan-ng/prism2mib.c     | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

drivers/staging/wlan-ng/p80211metadef.h +0 -4

index 9a7fa8e..c15ed08 100644
@@ -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) | \

drivers/staging/wlan-ng/p80211req.c +1 -1

index c7325fa..c1ad57f 100644
@@ -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)

drivers/staging/wlan-ng/prism2mib.c +1 -1

index 55eb2bb..faa1176 100644
@@ -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},

Signature · 1 line

1.9.1

Claudiu Beznea

author

2016-09-04 17:53 UTC #3 lore raw

PATCH 3/5 Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2

In reply to Claudiu Beznea

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

Signed-off-by Claudiu Beznea <[email protected]>

---
 drivers/staging/wlan-ng/p80211metadef.h | 4 ----
 drivers/staging/wlan-ng/p80211req.c     | 2 +-
 drivers/staging/wlan-ng/prism2mib.c     | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

drivers/staging/wlan-ng/p80211metadef.h +0 -4

index c15ed08..33b743c 100644
@@ -155,10 +155,6 @@
 #define DIDmib_dot11smt_dot11WEPDefaultKeysTable \
 			(P80211DID_MKSECTION(1) | \
 			P80211DID_MKGROUP(4))
-#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2 \
-			(P80211DID_MKSECTION(1) | \
-			P80211DID_MKGROUP(4) | \
-			P80211DID_MKITEM(3) | 0x0c000000)
 #define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3 \
 			(P80211DID_MKSECTION(1) | \
 			P80211DID_MKGROUP(4) | \

drivers/staging/wlan-ng/p80211req.c +1 -1

index c1ad57f..27292ea 100644
@@ -202,7 +202,7 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev,
 	switch (mibitem->did) {
 	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1):
 	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(2):
-	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2:
+	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(3):
 	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3:
 		if (!isget)
 			wep_change_key(wlandev,

drivers/staging/wlan-ng/prism2mib.c +1 -1

index faa1176..56307cc 100644
@@ -156,7 +156,7 @@ static struct mibrec mibtab[] = {
 	 F_STA | F_WRITE,
 	 HFA384x_RID_CNFWEPDEFAULTKEY1, 0, 0,
 	 prism2mib_wepdefaultkey},
-	{DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2,
+	{DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(3),
 	 F_STA | F_WRITE,
 	 HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0,
 	 prism2mib_wepdefaultkey},

Signature · 1 line

1.9.1

Claudiu Beznea

author

2016-09-04 17:53 UTC #4 lore raw

PATCH 4/5 Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3

In reply to Claudiu Beznea

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

Signed-off-by Claudiu Beznea <[email protected]>

---
 drivers/staging/wlan-ng/p80211metadef.h | 4 ----
 drivers/staging/wlan-ng/p80211req.c     | 2 +-
 drivers/staging/wlan-ng/prism2mib.c     | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

drivers/staging/wlan-ng/p80211metadef.h +0 -4

index 33b743c..33de041 100644
@@ -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

index 27292ea..f755318 100644
@@ -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

index 56307cc..0c51b7d 100644
@@ -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},

Signature · 1 line

1.9.1

Claudiu Beznea

author

2016-09-04 17:53 UTC #5 lore raw

PATCH 5/5 Staging: wlan-ng: changed definition of DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro

In reply to Claudiu Beznea

This patch changes definition of DIDmib_dot11smt_dot11WEPDefaultKeysTable_key()
macro and uses DIDmib_dot11smt_dot11WEPDefaultKeysTable instead of using directly (P80211DID_MKSECTION(1) | P80211DID_MKGROUP(4)).

Signed-off-by Claudiu Beznea <[email protected]>

---
 drivers/staging/wlan-ng/p80211metadef.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/staging/wlan-ng/p80211metadef.h +1 -2

index 33de041..b0d3567 100644
@@ -156,8 +156,7 @@
 			(P80211DID_MKSECTION(1) | \
 			P80211DID_MKGROUP(4))
 #define DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(_i) \
-			(P80211DID_MKSECTION(1) | \
-			P80211DID_MKGROUP(4) | \
+			(DIDmib_dot11smt_dot11WEPDefaultKeysTable | \
 			P80211DID_MKITEM(_i) | 0x0c000000)
 #define DIDmib_dot11smt_dot11PrivacyTable \
 			(P80211DID_MKSECTION(1) | \

Signature · 1 line

1.9.1