Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1475983
| Path | csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!diesel.cu.mi.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Claudiu Beznea <claudiu.beznea@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 4/5] Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3 |
| Date | Sun, 04 Sep 2016 20:00:02 +0200 |
| Message-ID | <sdJS2-wR-29@gated-at.bofh.it> (permalink) |
| References | <sdJS1-wR-11@gated-at.bofh.it> |
| X-Original-To | gregkh@linuxfoundation.org |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=e4n2PySpAglfcnnz3ob4/SilgNCaerCE93lnmjc/5sk=; b=YyfZLILVKOogoxfsxWnvvyJqXtrRBUP1232I8h8JqmLG4YnYjPlNwxb83ZPPU0O2JH qtAuSkQAnHayjJuYW40UEF8432nAJ3WX8K0QBB57OKp/gfvyc0g9PZPGWOuvWcRBRzAo BaXd48kvXmiPw6IWV+lQZm6fC+jMtckWll43BKUwNXA0tWW7tJ9Ah/wNygAD/kA4kBFf K6yM1gkbZBcaLgXE+H+6COkjElKkkQXadfBqTcvZsmZtFR9OxpIdA2It6zcNc7dagARn HCWkkQlXaBlj9S7Sv0eUeApGWfYZiEnIPJu91VrWOvUXXxRlo2FuxFyO3e7D1FxX8Wyp /KGQ== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=e4n2PySpAglfcnnz3ob4/SilgNCaerCE93lnmjc/5sk=; b=eru4syqjNtMr8bQj35eGOTlYXYSJt5g0bTz9je0KsJKVEDY0DhmQ7qonF4eE1S/I3X qOBH3VXAVw/jGXUxQOV7xzojCczkr5E3SKjfFNZ3ll1RWggbkn17ETHVIGqrGh07hn0i dVfF7auIO7kgA9G5rBODxI3nwGkb13W0MlIVdldW7+ndnsbG+IxrHiMcxqPY0vipUDB3 tSYJOCm734M9ivy8mZDQFfB5C7sf0BYDaXpztcDJSfUFbQmm+C07jhSK/aS4isQoj8Ph 7W9uy5D8G0T3nsxfatoesmO71Sg77yKfd/0IJg+f9cZsUobcO7iQ7r4Pk7NAi89UGv1i 0N2w== |
| X-Gm-Message-State | AE9vXwPs5KQGe0EKh7a7hs5Mn9gCT5JS1PsB/wScSClOsqyzcbU8RIwhr3QpguUu0qgVWA== |
| X-Received | by 10.194.192.35 with SMTP id hd3mr16064965wjc.27.1473011574073; Sun, 04 Sep 2016 10:52:54 -0700 (PDT) |
| X-Mailer | git-send-email 1.9.1 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 55 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | joe@perches.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Claudiu Beznea <claudiu.beznea@gmail.com> |
| X-Original-Date | Sun, 4 Sep 2016 20:52:20 +0300 |
| X-Original-Message-ID | <04c9cf24bf74397844a6d20041c586a985d36d7c.1473010281.git.claudiu.beznea@gmail.com> |
| X-Original-References | <cover.1473010281.git.claudiu.beznea@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1475983 |
Show key headers only | View raw
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
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[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
csiph-web