Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5befa937 authored by Quytelda Kahja's avatar Quytelda Kahja Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Fix IEEE80211 authentication algorithm constants. 



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: default avatarQuytelda Kahja <quytelda@tamalin.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79652e2c

drivers/staging/rtl8723bs/include/ieee80211.h

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+8 −8
Original line number Diff line number Diff line
@@ -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;