Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8723au: Remove (hopefully) last duplicate define of WLAN_EID_RSN

So much for thinking the removal of the previous 217 duplicate copies
would suffice ....

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jes Sorensen and committed by
Greg Kroah-Hartman
a131aac3 2bd3b4fb

+4 -6
+1 -1
drivers/staging/rtl8723au/core/rtw_ieee80211.c
··· 547 547 return _FAIL; 548 548 } 549 549 550 - if (*rsn_ie != _WPA2_IE_ID_ || *(rsn_ie+1) != (u8)(rsn_ie_len - 2)) { 550 + if (*rsn_ie != WLAN_EID_RSN || *(rsn_ie+1) != (u8)(rsn_ie_len - 2)) { 551 551 return _FAIL; 552 552 } 553 553
+3 -3
drivers/staging/rtl8723au/core/rtw_mlme.c
··· 2031 2031 authmode = WLAN_EID_VENDOR_SPECIFIC; 2032 2032 if (ndisauthmode == Ndis802_11AuthModeWPA2 || 2033 2033 ndisauthmode == Ndis802_11AuthModeWPA2PSK) 2034 - authmode = _WPA2_IE_ID_; 2034 + authmode = WLAN_EID_RSN; 2035 2035 2036 2036 if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { 2037 2037 memcpy(out_ie + ielength, psecuritypriv->wps_ie, ··· 2039 2039 2040 2040 ielength += psecuritypriv->wps_ie_len; 2041 2041 } else if (authmode == WLAN_EID_VENDOR_SPECIFIC || 2042 - authmode == _WPA2_IE_ID_) { 2042 + authmode == WLAN_EID_RSN) { 2043 2043 /* copy RSN or SSN */ 2044 2044 memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], 2045 2045 psecuritypriv->supplicant_ie[1] + 2); ··· 2050 2050 if (iEntry < 0) 2051 2051 return ielength; 2052 2052 else { 2053 - if (authmode == _WPA2_IE_ID_) 2053 + if (authmode == WLAN_EID_RSN) 2054 2054 ielength = rtw_append_pmkid(adapter, iEntry, 2055 2055 out_ie, ielength); 2056 2056 }
-2
drivers/staging/rtl8723au/include/rtw_security.h
··· 23 23 #define is_wep_enc(alg) (alg == WLAN_CIPHER_SUITE_WEP40 || \ 24 24 alg == WLAN_CIPHER_SUITE_WEP104) 25 25 26 - #define _WPA2_IE_ID_ 0x30 27 - 28 26 #define SHA256_MAC_LEN 32 29 27 #define AES_BLOCK_SIZE 16 30 28 #define AES_PRIV_SIZE (4 * 44)