public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Larry Finger <Larry.Finger@lwfinger.net>,
	Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
	Jes Sorensen <Jes.Sorensen@redhat.com>,
	Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH 4/8] rtl8192u: promote auth_mode to a full 8 bits
Date: Mon, 27 Apr 2015 01:25:37 -0400	[thread overview]
Message-ID: <1430112341-21402-5-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1430112341-21402-1-git-send-email-paul.gortmaker@windriver.com>

Currently LEAP is defined to two locally but the identically named
global constant is 128 in <linux/ieee80211.h>.  In order for us to
switch over to using the global value, we need to adjust the local
storage which is currently not enough to hold the larger value.

This is now consistent with the similar struct used in
drivers/net/wireless/ipw2x00/libipw.h and other drivers.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index bdad6d07c574..f6db98c7824c 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -649,7 +649,7 @@ struct ieee80211_snap_hdr {
 /* Authentication algorithms */
 #define WLAN_AUTH_OPEN 0
 #define WLAN_AUTH_SHARED_KEY 1
-#define WLAN_AUTH_LEAP 2
+#define WLAN_AUTH_LEAP 128
 
 #define WLAN_AUTH_CHALLENGE_LEN 128
 
@@ -961,10 +961,10 @@ struct ieee80211_device;
 struct ieee80211_security {
 	u16 active_key:2,
 	    enabled:1,
-	    auth_mode:2,
 	    auth_algo:4,
 	    unicast_uses_group:1,
 	    encrypt:1;
+	u8 auth_mode;
 	u8 key_sizes[WEP_KEYS];
 	u8 keys[WEP_KEYS][SCM_KEY_LEN];
 	u8 level;
-- 
2.2.1


  parent reply	other threads:[~2015-04-27  5:27 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-27  5:25 [PATCH 0/8] staging/rtl8xxx: delete ieee80211 constant duplication Paul Gortmaker
2015-04-27  5:25 ` [PATCH 1/8] rtl8188eu: don't duplicate ieee80211 constants for status/reason Paul Gortmaker
2015-04-27  5:25 ` [PATCH 2/8] rtl8712: " Paul Gortmaker
2015-04-27  5:25 ` [PATCH 3/8] rtl8192u: don't trample on <linux/ieee80211.h> struct namespace Paul Gortmaker
2015-04-30 13:52   ` Jes Sorensen
2015-04-30 14:22     ` Paul Gortmaker
2015-04-30 14:30       ` Jes Sorensen
2015-04-27  5:25 ` Paul Gortmaker [this message]
2015-04-27  5:25 ` [PATCH 5/8] rtl8192u: align local ieee80211_wmm_ac_param struct fields with global Paul Gortmaker
2015-04-27  5:25 ` [PATCH 6/8] rtl8192u: don't duplicate ieee80211 constants for status/auth/reason Paul Gortmaker
2015-04-27  5:25 ` [PATCH 7/8] rtl8192u: delete another embedded instance of generic reason codes Paul Gortmaker
2015-04-27  5:25 ` [PATCH 8/8] rtl8192e: delete local copy of iee80211 " Paul Gortmaker
2015-04-27 17:12 ` [PATCH 0/8] staging/rtl8xxx: delete ieee80211 constant duplication Larry Finger
2015-06-17 16:32   ` Jakub Sitnicki
2015-06-17 18:01     ` Larry Finger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1430112341-21402-5-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=Jes.Sorensen@redhat.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=florian.c.schilhabel@googlemail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox