1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 38fa8244cc96..6e26149809bf 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -775,10 +775,6 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev)
         reg = rtl818x_ioread8(priv, &priv->map->CW_CONF);
         reg |= RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT;
         rtl818x_iowrite8(priv, &priv->map->CW_CONF, reg);
-        reg = rtl818x_ioread8(priv, &priv->map->TX_AGC_CTL);
-        reg |= RTL818X_TX_AGC_CTL_PERPACKET_GAIN_SHIFT |
-               RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT;
-        rtl818x_iowrite8(priv, &priv->map->TX_AGC_CTL, reg);
 
         rtl818x_iowrite16_idx(priv, (__le16 *)0xFFE0, 0x0FFF, 1);
 
@@ -929,6 +925,12 @@ static int rtl8187_start(struct ieee80211_hw *dev)
                 priv->rx_conf = reg;
                 rtl818x_iowrite32(priv, &priv->map->RX_CONF, reg);
 
+                reg = rtl818x_ioread8(priv, &priv->map->TX_AGC_CTL);
+                reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_GAIN_SHIFT;
+                reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT;
+                reg &= ~RTL818X_TX_AGC_CTL_FEEDBACK_ANT;
+                rtl818x_iowrite8(priv, &priv->map->TX_AGC_CTL, reg);
+
                 rtl818x_iowrite32(priv, &priv->map->TX_CONF,
                                   RTL818X_TX_CONF_HW_SEQNUM |
                                   RTL818X_TX_CONF_DISREQQSIZE |