]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: rtl8723au: Eliminate the 217th copy of the microsoft OUI
authorJes Sorensen <Jes.Sorensen@redhat.com>
Sat, 26 Apr 2014 16:55:44 +0000 (18:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Apr 2014 17:16:21 +0000 (10:16 -0700)
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723au/core/rtw_ap.c

index be8b0e893dacda0b15d66f376e29e69a9e5a7f1a..9b31412b75216aff3982d187d097943c1d0b2057 100644 (file)
@@ -797,7 +797,6 @@ int rtw_check_beacon_data23a(struct rtw_adapter *padapter, u8 *pbuf,
        int group_cipher, pairwise_cipher;
        u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX];
        int supportRateNum = 0;
-       u8 OUI1[] = {0x00, 0x50, 0xf2, 0x01};
        u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
        struct registry_priv *pregistrypriv = &padapter->registrypriv;
        struct security_priv *psecuritypriv = &padapter->securitypriv;
@@ -929,7 +928,7 @@ int rtw_check_beacon_data23a(struct rtw_adapter *padapter, u8 *pbuf,
                p = rtw_get_ie23a(p, WLAN_EID_VENDOR_SPECIFIC, &ie_len,
                                  (pbss_network->IELength - _BEACON_IE_OFFSET_ -
                                  (ie_len + 2)));
-               if ((p) && (!memcmp(p+2, OUI1, 4))) {
+               if ((p) && (!memcmp(p+2, RTW_WPA_OUI23A_TYPE, 4))) {
                        if (rtw_parse_wpa_ie23a(p, ie_len+2, &group_cipher,
                                                &pairwise_cipher, NULL) == _SUCCESS) {
                                psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;