From bef55d3a6cf00a3cb40d1d9bdc5903909bea5143 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 11 Mar 2015 13:41:12 -0500 Subject: [PATCH] rtl8188eu: Remove RTL8192C_RECONFIG_TO_1T1R Signed-off-by: Larry Finger --- core/rtw_mlme.c | 12 +----------- core/rtw_mlme_ext.c | 9 --------- core/rtw_wlan_util.c | 12 +----------- include/Hal8192CPhyCfg.h | 3 --- 4 files changed, 2 insertions(+), 34 deletions(-) diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 4bbfa0c..d2c2d88 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -2991,21 +2991,11 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len) padapter->HalFunc.GetHwRegHandler(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); /* update the MCS rates */ - for (i = 0; i < 16; i++) - { + for (i = 0; i < 16; i++) { if((rf_type == RF_1T1R) || (rf_type == RF_1T2R)) - { pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; - } else - { pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - } - #ifdef RTL8192C_RECONFIG_TO_1T1R - { - pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; - } - #endif } /* switch to the 40M Hz mode accoring to the AP */ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 73ab0b3..3984c75 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -6838,15 +6838,6 @@ void issue_assocreq(struct adapter *padapter) memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); break; } -#ifdef RTL8192C_RECONFIG_TO_1T1R - { - if(pregpriv->rx_stbc) - pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= cpu_to_le16(0x0100);/* RX STBC One spatial stream */ - - memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R, 16); - } -#endif - #ifdef CONFIG_BT_COEXIST if (BT_1Ant(padapter) == true) { diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index c0068c5..fe8931c 100755 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -1029,21 +1029,11 @@ void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); /* update the MCS rates */ - for (i = 0; i < 16; i++) - { + for (i = 0; i < 16; i++) { if((rf_type == RF_1T1R) || (rf_type == RF_1T2R)) - { pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; - } else - { pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - } - #ifdef RTL8192C_RECONFIG_TO_1T1R - { - pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; - } - #endif } } diff --git a/include/Hal8192CPhyCfg.h b/include/Hal8192CPhyCfg.h index 3b8a718..8082678 100755 --- a/include/Hal8192CPhyCfg.h +++ b/include/Hal8192CPhyCfg.h @@ -352,9 +352,6 @@ SetAntennaConfig92C( IN u8 DefaultAnt ); -#ifdef RTL8192C_RECONFIG_TO_1T1R -extern void PHY_Reconfig_To_1T1R(struct adapter *padapter); -#endif /*--------------------------Exported Function prototype---------------------*/ #define PHY_QueryBBReg(Adapter, RegAddr, BitMask) rtl8192c_PHY_QueryBBReg((Adapter), (RegAddr), (BitMask))