staging: rtl8723au: Eliminate the 217th copy of the microsoft OUI
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d7cfe7c855
commit
819d181566
|
@ -797,7 +797,6 @@ int rtw_check_beacon_data23a(struct rtw_adapter *padapter, u8 *pbuf,
|
||||||
int group_cipher, pairwise_cipher;
|
int group_cipher, pairwise_cipher;
|
||||||
u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX];
|
u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX];
|
||||||
int supportRateNum = 0;
|
int supportRateNum = 0;
|
||||||
u8 OUI1[] = {0x00, 0x50, 0xf2, 0x01};
|
|
||||||
u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
|
u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
|
||||||
struct registry_priv *pregistrypriv = &padapter->registrypriv;
|
struct registry_priv *pregistrypriv = &padapter->registrypriv;
|
||||||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
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,
|
p = rtw_get_ie23a(p, WLAN_EID_VENDOR_SPECIFIC, &ie_len,
|
||||||
(pbss_network->IELength - _BEACON_IE_OFFSET_ -
|
(pbss_network->IELength - _BEACON_IE_OFFSET_ -
|
||||||
(ie_len + 2)));
|
(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,
|
if (rtw_parse_wpa_ie23a(p, ie_len+2, &group_cipher,
|
||||||
&pairwise_cipher, NULL) == _SUCCESS) {
|
&pairwise_cipher, NULL) == _SUCCESS) {
|
||||||
psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
|
psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
|
||||||
|
|
Loading…
Reference in a new issue