Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1475981 > unrolled thread
| Started by | Claudiu Beznea <claudiu.beznea@gmail.com> |
|---|---|
| First post | 2016-09-04 20:00 +0200 |
| Last post | 2016-09-04 20:00 +0200 |
| Articles | 2 — 1 participant |
Back to article view | Back to linux.kernel
[PATCH 0/5] Keep one macro instead of 4 for wep keys Claudiu Beznea <claudiu.beznea@gmail.com> - 2016-09-04 20:00 +0200
[PATCH 4/5] Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3 Claudiu Beznea <claudiu.beznea@gmail.com> - 2016-09-04 20:00 +0200
| From | Claudiu Beznea <claudiu.beznea@gmail.com> |
|---|---|
| Date | 2016-09-04 20:00 +0200 |
| Subject | [PATCH 0/5] Keep one macro instead of 4 for wep keys |
| Message-ID | <sdJS1-wR-11@gated-at.bofh.it> |
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(-)
--
1.9.1
[toc] | [next] | [standalone]
| From | Claudiu Beznea <claudiu.beznea@gmail.com> |
|---|---|
| Date | 2016-09-04 20:00 +0200 |
| Subject | [PATCH 4/5] Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3 |
| Message-ID | <sdJS2-wR-29@gated-at.bofh.it> |
| In reply to | #1475981 |
This patch removes
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3
macro and uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key()
instead.
Signed-off-by: Claudiu Beznea <claudiu.beznea@gmail.com>
---
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(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h
index 33b743c..33de041 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_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 27292ea..f755318 100644
--- 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 56307cc..0c51b7d 100644
--- 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},
--
1.9.1
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web