mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Quytelda Kahja <quytelda@tamalin.org>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, Quytelda Kahja <quytelda@tamalin.org>
Subject: [PATCH 10/23] staging: rtl8723bs: Fix IEEE80211 authentication algorithm constants.
Date: Tue, 27 Mar 2018 01:41:02 -0700	[thread overview]
Message-ID: <20180327084115.16129-10-quytelda@tamalin.org> (raw)
In-Reply-To: <20180327084115.16129-1-quytelda@tamalin.org>

This driver's local ieee80211 include file defines the constants
AUTH_ALG_* to represent authenication algorithm options.  However,
these constants are defined in 'linux/ieee80211.h' as WLAN_AUTH_*,
and have the correct values.

Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
---
 drivers/staging/rtl8723bs/include/ieee80211.h  |  4 ----
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 16 ++++++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index 2c7597ad0470..a353dc9b883a 100644
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -84,10 +84,6 @@ enum {
 #define IEEE_PARAM_IEEE_802_1X				6
 #define IEEE_PARAM_WPAX_SELECT				7
 
-#define AUTH_ALG_OPEN_SYSTEM			0x1
-#define AUTH_ALG_SHARED_KEY			0x2
-#define AUTH_ALG_LEAP				0x00000004
-
 #define IEEE_MLME_STA_DEAUTH				1
 #define IEEE_MLME_STA_DISASSOC			2
 
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 32dcee9a1451..b26533983864 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -476,26 +476,26 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
 	struct adapter *padapter = (struct adapter *) rtw_netdev_priv(dev);
 	int ret = 0;
 
-	if ((value & AUTH_ALG_SHARED_KEY) && (value & AUTH_ALG_OPEN_SYSTEM)) {
-		DBG_871X("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY and  AUTH_ALG_OPEN_SYSTEM [value:0x%x]\n", value);
+	if ((value & WLAN_AUTH_SHARED_KEY) && (value & WLAN_AUTH_OPEN)) {
+		DBG_871X("wpa_set_auth_algs, WLAN_AUTH_SHARED_KEY and WLAN_AUTH_OPEN [value:0x%x]\n", value);
 		padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
 		padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeAutoSwitch;
 		padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto;
-	} else if (value & AUTH_ALG_SHARED_KEY)	{
-		DBG_871X("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY  [value:0x%x]\n", value);
+	} else if (value & WLAN_AUTH_SHARED_KEY)	{
+		DBG_871X("wpa_set_auth_algs, WLAN_AUTH_SHARED_KEY  [value:0x%x]\n", value);
 		padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
 
 		padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeShared;
 		padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Shared;
-	} else if (value & AUTH_ALG_OPEN_SYSTEM) {
-		DBG_871X("wpa_set_auth_algs, AUTH_ALG_OPEN_SYSTEM\n");
+	} else if (value & WLAN_AUTH_OPEN) {
+		DBG_871X("wpa_set_auth_algs, WLAN_AUTH_OPEN\n");
 		/* padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; */
 		if (padapter->securitypriv.ndisauthtype < Ndis802_11AuthModeWPAPSK) {
 			padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;
 			padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
 		}
-	} else if (value & AUTH_ALG_LEAP) {
-		DBG_871X("wpa_set_auth_algs, AUTH_ALG_LEAP\n");
+	} else if (value & WLAN_AUTH_LEAP) {
+		DBG_871X("wpa_set_auth_algs, WLAN_AUTH_LEAP\n");
 	} else {
 		DBG_871X("wpa_set_auth_algs, error!\n");
 		ret = -EINVAL;
-- 
2.16.3

  parent reply	other threads:[~2018-03-27  8:41 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-24  4:10 [PATCH 1/3] ieee80211: Replace bit shifts with the BIT() macro for WLAN_CAPABILITY_* Quytelda Kahja
2018-03-24  4:10 ` [PATCH 2/3] ieee80211: Replace bit shifts with the BIT() macro for measurement masks Quytelda Kahja
2018-03-24  4:10 ` [PATCH 3/3] ieee80211: Replace bit shifts with the BIT() macro for 802.11g ERP IEs Quytelda Kahja
2018-03-24 21:23 ` [PATCH 1/3] ieee80211: Replace bit shifts with the BIT() macro for WLAN_CAPABILITY_* Larry Finger
2018-03-24 23:02   ` Quytelda Kahja
2018-03-27 13:16     ` Johannes Berg
2018-03-25 14:05 ` kbuild test robot
2018-03-26  9:15   ` Quytelda Kahja
2018-03-26  9:18     ` [PATCH] staging: rtl8723bs: Remove duplicate #defines Quytelda Kahja
2018-03-27  8:40     ` [PATCH 01/23] " Quytelda Kahja
2018-03-27  8:40       ` [PATCH 02/23] staging: rtl8723bs: Remove #defines shadowing enums in 'linux/ieee80211.h' Quytelda Kahja
2018-03-27  8:40       ` [PATCH 03/23] staging: rtl8723bs: Replace RTW_IEEE80211_FCTL_* with IEEE80211_FCTL_* Quytelda Kahja
2018-03-27  8:40       ` [PATCH 04/23] staging: rtl8723bs: Replace RTW_IEEE80211_FTYPE_* with IEEE80211_FTYPE_* Quytelda Kahja
2018-03-27  8:40       ` [PATCH 05/23] staging: rtl8723bs: Replace RTW_IEEE80211_STYPE_* with IEEE80211_STYPE_* Quytelda Kahja
2018-03-27  8:40       ` [PATCH 06/23] staging: rtl8723bs: Fix newlines in rtw_wx_set_auth() Quytelda Kahja
2018-03-27  8:40       ` [PATCH 07/23] staging: rtl8723bs: Remove unecessary braces from switch statement Quytelda Kahja
2018-03-27  8:41       ` [PATCH 08/23] staging: rtl8723bs: Remove braces from single statement conditionals Quytelda Kahja
2018-03-27  8:41       ` [PATCH 09/23] staging: rtl8723bs: Fix alignment in rtw_wx_set_auth() Quytelda Kahja
2018-03-27  8:41       ` Quytelda Kahja [this message]
2018-03-27  8:41       ` [PATCH 11/23] staging: rtl8723bs: Remove unnecessary length #define's Quytelda Kahja
2018-03-27  8:41       ` [PATCH 12/23] staging: rtl8723bs: Fix lines with trailing open parentheses Quytelda Kahja
2018-03-27  8:41       ` [PATCH 13/23] staging: rtl8723bs: Add spaces around ternary operators Quytelda Kahja
2018-03-27  8:41       ` [PATCH 14/23] staging: rtl8723bs: Add missing braces in else statement Quytelda Kahja
2018-03-27  8:41       ` [PATCH 15/23] staging: rtl8723bs: Change camel case to snake case in 'rtl8723bs_recv.c' Quytelda Kahja
2018-03-27  8:41       ` [PATCH 16/23] staging: rtl8723bs: Remove unnecessary blank lines " Quytelda Kahja
2018-03-27  8:41       ` [PATCH 17/23] staging: rtl8723bs: Fix lines too long in update_recvframe_attrib() Quytelda Kahja
2018-03-27  8:41       ` [PATCH 18/23] staging: rtl8723bs: Fix function signature that goes over 80 characters Quytelda Kahja
2018-03-27  8:41       ` [PATCH 19/23] staging: rtl8723bs: Factor out rtl8723bs_recv_tasklet() sections Quytelda Kahja
2018-03-27  8:41       ` [PATCH 20/23] staging: rtl8723bs: Replace NULL pointer comparison with '!' Quytelda Kahja
2018-03-27  8:41       ` [PATCH 21/23] staging: rtl8723bs: Rework 'struct _ODM_Per_Pkt_Info_' coding style Quytelda Kahja
2018-03-27  8:41       ` [PATCH 22/23] staging: rtl8723bs: Rework 'struct _ODM_Phy_Status_Info_' " Quytelda Kahja
2018-03-27  8:41       ` [PATCH 23/23] staging: rtl8723bs: Remove unecessary newlines from 'odm.h' Quytelda Kahja

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=20180327084115.16129-10-quytelda@tamalin.org \
    --to=quytelda@tamalin.org \
    --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

all inboxes | Powered by JetHome®