1 files changed, 1 insertions, 11 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index b32d59eafaa3..8fc2315c5963 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -349,15 +349,6 @@ int rt2x00mac_config(struct ieee80211_hw *hw, u32 changed)
         if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
                 return 0;
 
-        if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) {
-                rt2x00dev->ops->lib->set_retry_limit(hw,
-                        conf->short_frame_max_tx_count,
-                        conf->long_frame_max_tx_count);
-        }
-        changed &= ~IEEE80211_CONF_CHANGE_RETRY_LIMITS;
-        if (!changed)
-                return 0;
-
         /*
          * Only change device state when the radio is enabled. It does not
          * matter what parameters we have configured when the radio is disabled
@@ -379,7 +370,7 @@ int rt2x00mac_config(struct ieee80211_hw *hw, u32 changed)
                  * When we've just turned on the radio, we want to reprogram
                  * everything to ensure a consistent state
                  */
-                rt2x00lib_config(rt2x00dev, conf, !radio_on);
+                rt2x00lib_config(rt2x00dev, conf, changed);
 
                 /* Turn RX back on */
                 rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);
@@ -643,7 +634,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         spin_lock(&intf->lock);
-        memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));
         if (delayed) {
                 intf->delayed_flags |= delayed;
                 schedule_work(&rt2x00dev->intf_work);