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, 4 insertions, 14 deletions

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index a9a970469c2a..46b288dc8f4d 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3089,19 +3089,6 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)
         return rc ? -EINVAL : 0;
 }
 
-static int mwl8k_config_interface(struct ieee80211_hw *hw,
-                                  struct ieee80211_vif *vif,
-                                  struct ieee80211_if_conf *conf)
-{
-        struct mwl8k_vif *mv_vif = MWL8K_VIF(vif);
-        u32 changed = conf->changed;
-
-        if (changed & IEEE80211_IFCC_BSSID)
-                memcpy(mv_vif->bssid, conf->bssid, IEEE80211_ADDR_LEN);
-
-        return 0;
-}
-
 struct mwl8k_bss_info_changed_worker {
         struct mwl8k_work_struct header;
         struct ieee80211_vif *vif;
@@ -3183,8 +3170,12 @@ static void mwl8k_bss_info_changed(struct ieee80211_hw *hw,
 {
         struct mwl8k_bss_info_changed_worker *worker;
         struct mwl8k_priv *priv = hw->priv;
+        struct mwl8k_vif *mv_vif = MWL8K_VIF(vif);
         int rc;
 
+        if (changed & BSS_CHANGED_BSSID)
+                memcpy(mv_vif->bssid, info->bssid, IEEE80211_ADDR_LEN);
+
         if ((changed & BSS_CHANGED_ASSOC) == 0)
                 return;
 
@@ -3442,7 +3433,6 @@ static const struct ieee80211_ops mwl8k_ops = {
         .add_interface          = mwl8k_add_interface,
         .remove_interface       = mwl8k_remove_interface,
         .config                 = mwl8k_config,
-        .config_interface       = mwl8k_config_interface,
         .bss_info_changed       = mwl8k_bss_info_changed,
         .configure_filter       = mwl8k_configure_filter,
         .set_rts_threshold      = mwl8k_set_rts_threshold,