mac80211: unify config_interface and bss_info_changed

The config_interface method is a little strange, it contains the
BSSID and beacon updates, while bss_info_changed contains most
other BSS information for each interface. This patch removes
config_interface and rolls all the information it previously
passed to drivers into bss_info_changed.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 33 insertions, 47 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index c3a51266de20..6bdb1704083b 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -755,52 +755,6 @@ static int zd_op_config(struct ieee80211_hw *hw, u32 changed)
         return zd_chip_set_channel(&mac->chip, conf->channel->hw_value);
 }
 
-static int zd_op_config_interface(struct ieee80211_hw *hw,
-                                  struct ieee80211_vif *vif,
-                                   struct ieee80211_if_conf *conf)
-{
-        struct zd_mac *mac = zd_hw_mac(hw);
-        int associated;
-        int r;
-
-        if (mac->type == NL80211_IFTYPE_MESH_POINT ||
-            mac->type == NL80211_IFTYPE_ADHOC) {
-                associated = true;
-                if (conf->changed & IEEE80211_IFCC_BEACON) {
-                        struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);
-
-                        if (!beacon)
-                                return -ENOMEM;
-                        r = zd_mac_config_beacon(hw, beacon);
-                        kfree_skb(beacon);
-
-                        if (r < 0)
-                                return r;
-                }
-
-                if (conf->changed & IEEE80211_IFCC_BEACON_ENABLED) {
-                        u32 interval;
-
-                        if (conf->enable_beacon)
-                                interval = BCN_MODE_IBSS | hw->conf.beacon_int;
-                        else
-                                interval = 0;
-
-                        r = zd_set_beacon_interval(&mac->chip, interval);
-                        if (r < 0)
-                                return r;
-                }
-        } else
-                associated = is_valid_ether_addr(conf->bssid);
-
-        spin_lock_irq(&mac->lock);
-        mac->associated = associated;
-        spin_unlock_irq(&mac->lock);
-
-        /* TODO: do hardware bssid filtering */
-        return 0;
-}
-
 static void zd_process_intr(struct work_struct *work)
 {
         u16 int_status;
@@ -923,9 +877,42 @@ static void zd_op_bss_info_changed(struct ieee80211_hw *hw,
 {
         struct zd_mac *mac = zd_hw_mac(hw);
         unsigned long flags;
+        int associated;
 
         dev_dbg_f(zd_mac_dev(mac), "changes: %x\n", changes);
 
+        if (mac->type == NL80211_IFTYPE_MESH_POINT ||
+            mac->type == NL80211_IFTYPE_ADHOC) {
+                associated = true;
+                if (changes & BSS_CHANGED_BEACON) {
+                        struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);
+
+                        if (beacon) {
+                                zd_mac_config_beacon(hw, beacon);
+                                kfree_skb(beacon);
+                        }
+                }
+
+                if (changes & BSS_CHANGED_BEACON_ENABLED) {
+                        u32 interval;
+
+                        if (bss_conf->enable_beacon)
+                                interval = BCN_MODE_IBSS |
+                                                bss_conf->beacon_int;
+                        else
+                                interval = 0;
+
+                        zd_set_beacon_interval(&mac->chip, interval);
+                }
+        } else
+                associated = is_valid_ether_addr(bss_conf->bssid);
+
+        spin_lock_irq(&mac->lock);
+        mac->associated = associated;
+        spin_unlock_irq(&mac->lock);
+
+        /* TODO: do hardware bssid filtering */
+
         if (changes & BSS_CHANGED_ERP_PREAMBLE) {
                 spin_lock_irqsave(&mac->lock, flags);
                 mac->short_preamble = bss_conf->use_short_preamble;
@@ -952,7 +939,6 @@ static const struct ieee80211_ops zd_ops = {
         .add_interface          = zd_op_add_interface,
         .remove_interface       = zd_op_remove_interface,
         .config                 = zd_op_config,
-        .config_interface       = zd_op_config_interface,
         .configure_filter       = zd_op_configure_filter,
         .bss_info_changed       = zd_op_bss_info_changed,
         .get_tsf                = zd_op_get_tsf,