1 files changed, 20 insertions, 23 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 69959124d25d..72111694154e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -75,43 +75,40 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
         rt2x00dev->ops->lib->config_intf(rt2x00dev, intf, &conf, flags);
 }
 
-void rt2x00lib_config_preamble(struct rt2x00_dev *rt2x00dev,
-                               struct rt2x00_intf *intf,
-                               const unsigned int short_preamble)
+void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,
+                          struct rt2x00_intf *intf,
+                          struct ieee80211_bss_conf *bss_conf)
 {
+        struct rt2x00lib_erp erp;
         int retval;
-        int ack_timeout;
-        int ack_consume_time;
 
-        ack_timeout = PLCP + get_duration(ACK_SIZE, 10);
-        ack_consume_time = SIFS + PLCP + get_duration(ACK_SIZE, 10);
+        memset(&erp, 0, sizeof(erp));
+
+        erp.short_preamble = bss_conf->use_short_preamble;
+        erp.ack_timeout = PLCP + get_duration(ACK_SIZE, 10);
+        erp.ack_consume_time = SIFS + PLCP + get_duration(ACK_SIZE, 10);
 
         if (rt2x00dev->hw->conf.flags & IEEE80211_CONF_SHORT_SLOT_TIME)
-                ack_timeout += SHORT_DIFS;
+                erp.ack_timeout += SHORT_DIFS;
         else
-                ack_timeout += DIFS;
+                erp.ack_timeout += DIFS;
 
-        if (short_preamble) {
-                ack_timeout += SHORT_PREAMBLE;
-                ack_consume_time += SHORT_PREAMBLE;
+        if (bss_conf->use_short_preamble) {
+                erp.ack_timeout += SHORT_PREAMBLE;
+                erp.ack_consume_time += SHORT_PREAMBLE;
         } else {
-                ack_timeout += PREAMBLE;
-                ack_consume_time += PREAMBLE;
+                erp.ack_timeout += PREAMBLE;
+                erp.ack_consume_time += PREAMBLE;
         }
 
-        retval = rt2x00dev->ops->lib->config_preamble(rt2x00dev,
-                                                      short_preamble,
-                                                      ack_timeout,
-                                                      ack_consume_time);
-
-        spin_lock(&intf->lock);
+        retval = rt2x00dev->ops->lib->config_erp(rt2x00dev, &erp);
 
         if (retval) {
-                intf->delayed_flags |= DELAYED_CONFIG_PREAMBLE;
+                spin_lock(&intf->lock);
+                intf->delayed_flags |= DELAYED_CONFIG_ERP;
                 queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work);
+                spin_unlock(&intf->lock);
         }
-
-        spin_unlock(&intf->lock);
 }
 
 void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,