8723BU: Update 8723BU wifi driver to version v4.3.16_14189.20150519_BTCOEX2015119...

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rockchip_wlan / rtl8723bu / core / rtw_beamforming.c

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_beamforming.c b/drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_beamforming.c
index 8d8c614e7b82d15b2321ddba8e00230d46934731..cfdba228ab9e9ffbbd787e07f63b7fd0a46bc995 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_beamforming.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_beamforming.c
@@ -92,8 +92,8 @@ struct beamforming_entry      *beamforming_add_entry(PADAPTER adapter, u8* ra, u16 ai
                pEntry->sound_bw = bw;\r
                if (check_fwstate(pmlmepriv, WIFI_AP_STATE))\r
                {\r
-                       u16     BSSID = ((adapter->eeprompriv.mac_addr[5] & 0xf0) >> 4) ^ \r
-                                                       (adapter->eeprompriv.mac_addr[5] & 0xf);        // BSSID[44:47] xor BSSID[40:43]\r
+                       u16     BSSID = ((*(adapter_mac_addr(adapter) + 5) & 0xf0) >> 4) ^ \r
+                               (*(adapter_mac_addr(adapter) + 5) & 0xf); /* BSSID[44:47] xor BSSID[40:43] */\r
                        pEntry->p_aid = (aid + BSSID * 32) & 0x1ff;             // (dec(A) + dec(B)*32) mod 512\r
                }               \r
                else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))\r
@@ -145,7 +145,7 @@ void        beamforming_dym_ndpa_rate(PADAPTER adapter)
        u16     NDPARate = MGN_6M;\r
        PHAL_DATA_TYPE  pHalData = GET_HAL_DATA(adapter);\r
        \r
-       if(pHalData->dmpriv.MinUndecoratedPWDBForDM > 30) // link RSSI > 30%\r
+       if(pHalData->MinUndecoratedPWDBForDM > 30) // link RSSI > 30%\r
                NDPARate = MGN_24M;\r
        else\r
                NDPARate = MGN_6M;\r
@@ -349,7 +349,7 @@ BOOLEAN     issue_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx
        SetFrameSubType(pframe, WIFI_ACTION_NOACK);\r
 \r
        _rtw_memcpy(pwlanhdr->addr1, ra, ETH_ALEN);\r
-       _rtw_memcpy(pwlanhdr->addr2, myid(&(Adapter->eeprompriv)), ETH_ALEN);\r
+       _rtw_memcpy(pwlanhdr->addr2, adapter_mac_addr(Adapter), ETH_ALEN);\r
        _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN);\r
 \r
        if( pmlmeext->cur_wireless_mode == WIRELESS_11B)\r
@@ -429,7 +429,7 @@ BOOLEAN     issue_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH b
        SetFrameSubType(pframe, WIFI_NDPA);\r
 \r
        _rtw_memcpy(pwlanhdr->addr1, ra, ETH_ALEN);\r
-       _rtw_memcpy(pwlanhdr->addr2, myid(&(Adapter->eeprompriv)), ETH_ALEN);\r
+       _rtw_memcpy(pwlanhdr->addr2, adapter_mac_addr(Adapter), ETH_ALEN);\r
 \r
        if (IsSupported5G(pmlmeext->cur_wireless_mode) || IsSupportedHT(pmlmeext->cur_wireless_mode))\r
                aSifsTime = 16;\r