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>

diff --git a/drivers/staging/rtl8723au/core/rtw_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
index f2c4a0e89ed45580551a214b3c5b32ac58bb256d..efad6f8ccfb826b0b79740514cac3b2c275371e1 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
@@ -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;
        }
 

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 77714fe259a238d87c1fd433506ee353163fc3f1..fc848316c3f5a685c688e68de20cf095091e7475 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -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);
        }

diff --git a/drivers/staging/rtl8723au/include/rtw_security.h b/drivers/staging/rtl8723au/include/rtw_security.h
index 8ed7b2fd6d1398b3111f52d4bf585dccade97b1b..624a9d788e4517fa01f49948c4c57bf1471dc300 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_security.h
+++ b/drivers/staging/rtl8723au/include/rtw_security.h
@@ -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)