Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1475978
| Path | csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Claudiu Beznea <claudiu.beznea@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 3/5] Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2 |
| Date | Sun, 04 Sep 2016 20:00:01 +0200 |
| Message-ID | <sdJS1-wR-9@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=RPZo7QoUFOlhRlRFrhHeOAYDDgbiuNaUE2bF7kJttXU=; b=cWLYEGnnKhMC8Iz38uSJAYgGQ16tUj8FrkAXqTJsBfIeI5E2E4ApWXfBNJtoZjTIh/ XEs4ZjwESyBWk51014hKpwFgAo4udJ/xLPt0wPaDDt5tlLfj8Op+8uXYLdhGhk74q/gK w90pgXFqDqGDjx1oEKtqCKtMo2Rms23odXaHFOgVpQA2PBKhxq1IAYZQ8m4LvoJRKlzL t9uxayhHbjggZbpwEB4C38Saur49AHQfvyeiXQ+5jR7IrLEnqr7aOzEv/BNU5RIoFgop 8XnMAn9d6zylVnGq+nIFL2cCfeW36dkLKBHpqyxzhcicKIsrTfo4BA+b6Fr6BS2e4Cnp OFvQ== |
| 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=RPZo7QoUFOlhRlRFrhHeOAYDDgbiuNaUE2bF7kJttXU=; b=a/dZfCCn3qFHkdw6/2d5znZ8qMpGM/ZZZr2UapHqdoLFPmSrl0/5hapyvA6juM+lvY kVXxyKmGg8Bki83wJ9cNgDn5RxfyXFJ1498hZZ2UFdmduWb982W+i2c13UcTGP2Xo8Na 2we11L0EROOh0xsfYp4xUgrGrQ3Hq+mmmkbj+r6RAcbI2wRL+4fsiqBy2nXQxCHu5Nn4 oq6jbJHhggIstnMb3YLbEmG4yhHAx5FmjU3+Kr9Rymm8QpQzMwwR6xhdsg1TFy0Z8n3x k8Ci+8DtNxiE2VlrTdVEJwkqBJw0VnZVhPUV6TcV3jBFQ2dpGP8BA+03kVQEITOS8hNU 1iwA== |
| X-Gm-Message-State | AE9vXwNJ5nnlf31RN49DMQihFQdeV6Skf483pPUS4MvOdEj7N+THt50ouV0BO5WQwDQQJQ== |
| X-Received | by 10.194.111.66 with SMTP id ig2mr13445wjb.125.1473011572540; Sun, 04 Sep 2016 10:52:52 -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:19 +0300 |
| X-Original-Message-ID | <e0a3480d73edbd2f76d012d046e71fd9d94a3b7e.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:1475978 |
Show key headers only | View raw
This patch removes
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2
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 c15ed08..33b743c 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_dot11WEPDefaultKey2 \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(4) | \
- P80211DID_MKITEM(3) | 0x0c000000)
#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3 \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(4) | \
diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index c1ad57f..27292ea 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -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,
diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index faa1176..56307cc 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -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},
--
1.9.1
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH 3/5] Staging: wlan-ng: uses DIDmib_dot11smt_dot11WEPDefaultKeysTable_key() macro instead of DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2 Claudiu Beznea <claudiu.beznea@gmail.com> - 2016-09-04 20:00 +0200
csiph-web