diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8723ae/hw.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c index 0a8c03863fb2..149804816ac4 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | |||
@@ -703,11 +703,9 @@ static void _rtl8723ae_hw_configure(struct ieee80211_hw *hw) | |||
703 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 703 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
704 | struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw); | 704 | struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw); |
705 | u8 reg_bw_opmode; | 705 | u8 reg_bw_opmode; |
706 | u32 reg_ratr, reg_prsr; | 706 | u32 reg_prsr; |
707 | 707 | ||
708 | reg_bw_opmode = BW_OPMODE_20MHZ; | 708 | reg_bw_opmode = BW_OPMODE_20MHZ; |
709 | reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG | | ||
710 | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS; | ||
711 | reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG; | 709 | reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG; |
712 | 710 | ||
713 | rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, 0x8); | 711 | rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, 0x8); |
@@ -2030,7 +2028,7 @@ bool rtl8723ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) | |||
2030 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 2028 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
2031 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); | 2029 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); |
2032 | struct rtl_phy *rtlphy = &(rtlpriv->phy); | 2030 | struct rtl_phy *rtlphy = &(rtlpriv->phy); |
2033 | enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate; | 2031 | enum rf_pwrstate e_rfpowerstate_toset; |
2034 | u8 u1tmp; | 2032 | u8 u1tmp; |
2035 | bool actuallyset = false; | 2033 | bool actuallyset = false; |
2036 | 2034 | ||
@@ -2049,8 +2047,6 @@ bool rtl8723ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) | |||
2049 | spin_unlock(&rtlpriv->locks.rf_ps_lock); | 2047 | spin_unlock(&rtlpriv->locks.rf_ps_lock); |
2050 | } | 2048 | } |
2051 | 2049 | ||
2052 | cur_rfstate = ppsc->rfpwr_state; | ||
2053 | |||
2054 | rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL_2, | 2050 | rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL_2, |
2055 | rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL_2)&~(BIT(1))); | 2051 | rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL_2)&~(BIT(1))); |
2056 | 2052 | ||