Github/rtl8192eu-linux-driver
1
0
Fork 0
mirror of https://github.com/Mange/rtl8192eu-linux-driver synced 2024-11-22 13:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix IEEE80211 authentication algorithm constants.

Browse Source 
Use the values provided by linux/wireless.h

Port 5befa937e8daaebcde81b9423eb93f3ff2e918f7
Port b658acbf64ae38b8fca982c2929ccc0bf4eb1ea2
This commit is contained in:
Carlos Garces 2021-10-20 17:34:38 +02:00
parent 7a17174176
commit de617fc8d5
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/ieee80211.h
View File

@ -89,9 +89,6 @@ enum {
#define IEEE_PARAM_IEEE_802_1X 6 #define IEEE_PARAM_IEEE_802_1X 6
#define IEEE_PARAM_WPAX_SELECT 7 #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_DEAUTH 1
#define IEEE_MLME_STA_DISASSOC 2 #define IEEE_MLME_STA_DISASSOC 2

16
os_dep/linux/ioctl_linux.c
View File

@ -755,13 +755,13 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
_adapter *padapter = (_adapter *) rtw_netdev_priv(dev); _adapter *padapter = (_adapter *) rtw_netdev_priv(dev);
int ret = 0; int ret = 0;
if ((value & AUTH_ALG_SHARED_KEY) && (value & AUTH_ALG_OPEN_SYSTEM)) { if ((value & IW_AUTH_ALG_SHARED_KEY) && (value & IW_AUTH_ALG_OPEN_SYSTEM)) {
RTW_INFO("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY and AUTH_ALG_OPEN_SYSTEM [value:0x%x]\n", value); RTW_INFO("wpa_set_auth_algs, IW_AUTH_ALG_SHARED_KEY and IW_AUTH_ALG_OPEN_SYSTEM [value:0x%x]\n", value);
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeAutoSwitch; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeAutoSwitch;
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto;
} else if (value & AUTH_ALG_SHARED_KEY) { } else if (value & IW_AUTH_ALG_SHARED_KEY) {
RTW_INFO("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY [value:0x%x]\n", value); RTW_INFO("wpa_set_auth_algs, IW_AUTH_ALG_SHARED_KEY [value:0x%x]\n", value);
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
#ifdef CONFIG_PLATFORM_MT53XX #ifdef CONFIG_PLATFORM_MT53XX
@ -771,8 +771,8 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeShared; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeShared;
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Shared; padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Shared;
#endif #endif
} else if (value & AUTH_ALG_OPEN_SYSTEM) { } else if (value & IW_AUTH_ALG_OPEN_SYSTEM) {
RTW_INFO("wpa_set_auth_algs, AUTH_ALG_OPEN_SYSTEM\n"); RTW_INFO("wpa_set_auth_algs, IW_AUTH_ALG_OPEN_SYSTEM\n");
/* padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; */ /* padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; */
if (padapter->securitypriv.ndisauthtype < Ndis802_11AuthModeWPAPSK) { if (padapter->securitypriv.ndisauthtype < Ndis802_11AuthModeWPAPSK) {
#ifdef CONFIG_PLATFORM_MT53XX #ifdef CONFIG_PLATFORM_MT53XX
@ -784,8 +784,8 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
#endif #endif
} }
} else if (value & AUTH_ALG_LEAP) } else if (value & IW_AUTH_ALG_LEAP)
RTW_INFO("wpa_set_auth_algs, AUTH_ALG_LEAP\n"); RTW_INFO("wpa_set_auth_algs, IW_AUTH_ALG_LEAP\n");
else { else {
RTW_INFO("wpa_set_auth_algs, error!\n"); RTW_INFO("wpa_set_auth_algs, error!\n");
ret = -EINVAL; ret = -EINVAL;