Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752704AbbD0F1L (ORCPT ); Mon, 27 Apr 2015 01:27:11 -0400 Received: from mail1.windriver.com ([147.11.146.13]:49544 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752284AbbD0F0F (ORCPT ); Mon, 27 Apr 2015 01:26:05 -0400 From: Paul Gortmaker To: CC: Greg Kroah-Hartman , Larry Finger , Florian Schilhabel , Jes Sorensen , Paul Gortmaker Subject: [PATCH 4/8] rtl8192u: promote auth_mode to a full 8 bits Date: Mon, 27 Apr 2015 01:25:37 -0400 Message-ID: <1430112341-21402-5-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1430112341-21402-1-git-send-email-paul.gortmaker@windriver.com> References: <1430112341-21402-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1580 Lines: 46 Currently LEAP is defined to two locally but the identically named global constant is 128 in . 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/