Commit a131aac3 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

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: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2bd3b4fb

drivers/staging/rtl8723au/core/rtw_ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ int rtw_parse_wpa2_ie23a(const u8* rsn_ie, int rsn_ie_len, int *group_cipher, 
		return _FAIL;

	}



	if (*rsn_ie != _WPA2_IE_ID_ || *(rsn_ie+1) != (u8)(rsn_ie_len - 2)) {

	if (*rsn_ie != WLAN_EID_RSN || *(rsn_ie+1) != (u8)(rsn_ie_len - 2)) {

		return _FAIL;

	}

drivers/staging/rtl8723au/core/rtw_mlme.c

+3 −3
Original line number Diff line number Diff line
@@ -2031,7 +2031,7 @@ int rtw_restruct_sec_ie23a(struct rtw_adapter *adapter, u8 *in_ie, u8 *out_ie, 
		authmode = WLAN_EID_VENDOR_SPECIFIC;

	if (ndisauthmode == Ndis802_11AuthModeWPA2 ||

	    ndisauthmode == Ndis802_11AuthModeWPA2PSK)

		authmode = _WPA2_IE_ID_;

		authmode = WLAN_EID_RSN;



	if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) {

		memcpy(out_ie + ielength, psecuritypriv->wps_ie,
@@ -2039,7 +2039,7 @@ int rtw_restruct_sec_ie23a(struct rtw_adapter *adapter, u8 *in_ie, u8 *out_ie, 


		ielength += psecuritypriv->wps_ie_len;

	} else if (authmode == WLAN_EID_VENDOR_SPECIFIC ||

		   authmode == _WPA2_IE_ID_) {

		   authmode == WLAN_EID_RSN) {

		/* copy RSN or SSN */

		memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0],

		       psecuritypriv->supplicant_ie[1] + 2);
@@ -2050,7 +2050,7 @@ int rtw_restruct_sec_ie23a(struct rtw_adapter *adapter, u8 *in_ie, u8 *out_ie, 
	if (iEntry < 0)

		return ielength;

	else {

		if (authmode == _WPA2_IE_ID_)

		if (authmode == WLAN_EID_RSN)

			ielength = rtw_append_pmkid(adapter, iEntry,

						    out_ie, ielength);

	}

drivers/staging/rtl8723au/include/rtw_security.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#define is_wep_enc(alg) (alg == WLAN_CIPHER_SUITE_WEP40 || \

			 alg == WLAN_CIPHER_SUITE_WEP104)



#define _WPA2_IE_ID_	0x30



#define SHA256_MAC_LEN 32

#define AES_BLOCK_SIZE 16

#define AES_PRIV_SIZE (4 * 44)