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, 8 insertions, 6 deletions

diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index f71821795018..2b9e379994a1 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1311,18 +1311,20 @@ static int adm8211_config(struct ieee80211_hw *dev, u32 changed)
         return 0;
 }
 
-static int adm8211_config_interface(struct ieee80211_hw *dev,
-                                    struct ieee80211_vif *vif,
-                                    struct ieee80211_if_conf *conf)
+static void adm8211_bss_info_changed(struct ieee80211_hw *dev,
+                                     struct ieee80211_vif *vif,
+                                     struct ieee80211_bss_conf *conf,
+                                     u32 changes)
 {
         struct adm8211_priv *priv = dev->priv;
 
+        if (!(changes & BSS_CHANGED_BSSID))
+                return;
+
         if (memcmp(conf->bssid, priv->bssid, ETH_ALEN)) {
                 adm8211_set_bssid(dev, conf->bssid);
                 memcpy(priv->bssid, conf->bssid, ETH_ALEN);
         }
-
-        return 0;
 }
 
 static void adm8211_configure_filter(struct ieee80211_hw *dev,
@@ -1753,7 +1755,7 @@ static const struct ieee80211_ops adm8211_ops = {
         .add_interface          = adm8211_add_interface,
         .remove_interface       = adm8211_remove_interface,
         .config                 = adm8211_config,
-        .config_interface       = adm8211_config_interface,
+        .bss_info_changed       = adm8211_bss_info_changed,
         .configure_filter       = adm8211_configure_filter,
         .get_stats              = adm8211_get_stats,
         .get_tx_stats           = adm8211_get_tx_stats,