rt2x00: Rename config_preamble() to config_erp()

Rename config_preamble() to config_erp() and cleanup argument
list by putting it all into a single structure.
This will make the function more meaningful and easier to
expand later. This second option is mostly intended to make
the patch "mac80211: proper short-slot handling" from Johannes Berg
easier to apply for rt2x00.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 76a2a7c118b2..0a11c27d603b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -436,17 +436,15 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         /*
-         * When the preamble mode has changed, we should perform additional
-         * configuration steps. For all other changes we are already done.
+         * When the erp information has changed, we should perform
+         * additional configuration steps. For all other changes we are done.
          */
-        if (changes & BSS_CHANGED_ERP_PREAMBLE) {
-                rt2x00lib_config_preamble(rt2x00dev, intf,
-                                          bss_conf->use_short_preamble);
+        if (changes & BSS_CHANGED_ERP_PREAMBLE)
+                rt2x00lib_config_erp(rt2x00dev, intf, bss_conf);
 
-                spin_lock(&intf->lock);
-                memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));
-                spin_unlock(&intf->lock);
-        }
+        spin_lock(&intf->lock);
+        memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));
+        spin_unlock(&intf->lock);
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed);