1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index b4fad744503e..9f0733bc4fae 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -103,6 +103,13 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
         libconf.ant.tx = tx;
 
         /*
+         * Antenna setup changes require the RX to be disabled,
+         * else the changes will be ignored by the device.
+         */
+        if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
+                rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);
+
+        /*
          * Write new antenna setup to device and reset the link tuner.
          * The latter is required since we need to recalibrate the
          * noise-sensitivity ratio for the new setup.
@@ -112,6 +119,9 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
 
         rt2x00dev->link.ant.active.rx = libconf.ant.rx;
         rt2x00dev->link.ant.active.tx = libconf.ant.tx;
+
+        if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
+                rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);
 }
 
 void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,