19 files changed, 183 insertions, 120 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index a793cd11f738..77e7202c026b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -520,10 +520,8 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
                         break;
 
                         /*
-                         * TODO: There is no callback function from upper
-                         * stack to inform us when associated status. this
-                         * work around to sniff assoc_resp management frame
-                         * and finish the association process.
+                         * TODO: Use the new callback function from
+                         * mac80211 instead of sniffing these packets.
                          */
                 case IEEE80211_STYPE_ASSOC_RESP:
                 case IEEE80211_STYPE_REASSOC_RESP:{
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 89e2c44bfcca..ed3f119b56cd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4095,10 +4095,8 @@ static void iwl4965_rx_reply_rx(struct iwl4965_priv *priv,
                         break;
 
                         /*
-                         * TODO: There is no callback function from upper
-                         * stack to inform us when associated status. this
-                         * work around to sniff assoc_resp management frame
-                         * and finish the association process.
+                         * TODO: Use the new callback function from
+                         * mac80211 instead of sniffing these packets.
                          */
                 case IEEE80211_STYPE_ASSOC_RESP:
                 case IEEE80211_STYPE_REASSOC_RESP:
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 92bb7e13a1f0..2597c08a2395 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -7764,25 +7764,35 @@ static void iwl4965_mac_remove_interface(struct ieee80211_hw *hw,
         IWL_DEBUG_MAC80211("leave\n");
 
 }
-static void iwl4965_mac_erp_ie_changed(struct ieee80211_hw *hw,
-                u8 changes, int cts_protection, int preamble)
+
+static void iwl4965_bss_info_changed(struct ieee80211_hw *hw,
+                                     struct ieee80211_vif *vif,
+                                     struct ieee80211_bss_conf *bss_conf,
+                                     u32 changes)
 {
         struct iwl4965_priv *priv = hw->priv;
 
-        if (changes & IEEE80211_ERP_CHANGE_PREAMBLE) {
-                if (preamble == WLAN_ERP_PREAMBLE_SHORT)
+        if (changes & BSS_CHANGED_ERP_PREAMBLE) {
+                if (bss_conf->use_short_preamble)
                         priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
                 else
                         priv->staging_rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
         }
 
-        if (changes & IEEE80211_ERP_CHANGE_PROTECTION) {
-                if (cts_protection && (priv->phymode != MODE_IEEE80211A))
+        if (changes & BSS_CHANGED_ERP_CTS_PROT) {
+                if (bss_conf->use_cts_prot && (priv->phymode != MODE_IEEE80211A))
                         priv->staging_rxon.flags |= RXON_FLG_TGG_PROTECT_MSK;
                 else
                         priv->staging_rxon.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
         }
 
+        if (changes & BSS_CHANGED_ASSOC) {
+                /*
+                 * TODO:
+                 * do stuff instead of sniffing assoc resp
+                 */
+        }
+
         if (iwl4965_is_associated(priv))
                 iwl4965_send_rxon_assoc(priv);
 }
@@ -8952,7 +8962,7 @@ static struct ieee80211_ops iwl4965_hw_ops = {
         .get_tsf = iwl4965_mac_get_tsf,
         .reset_tsf = iwl4965_mac_reset_tsf,
         .beacon_update = iwl4965_mac_beacon_update,
-        .erp_ie_changed = iwl4965_mac_erp_ie_changed,
+        .bss_info_changed = iwl4965_bss_info_changed,
 #ifdef CONFIG_IWL4965_HT
         .conf_ht = iwl4965_mac_conf_ht,
         .ampdu_action = iwl4965_mac_ampdu_action,
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index f4d0c779ac78..d6cba138c7ab 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1524,7 +1524,7 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = {
         .configure_filter       = rt2400pci_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
         .set_retry_limit        = rt2400pci_set_retry_limit,
-        .erp_ie_changed         = rt2x00mac_erp_ie_changed,
+        .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2400pci_conf_tx,
         .get_tx_stats           = rt2x00mac_get_tx_stats,
         .get_tsf                = rt2400pci_get_tsf,
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 206b50ff831f..e874fdcae204 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1835,7 +1835,7 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = {
         .configure_filter       = rt2500pci_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
         .set_retry_limit        = rt2500pci_set_retry_limit,
-        .erp_ie_changed         = rt2x00mac_erp_ie_changed,
+        .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
         .get_tx_stats           = rt2x00mac_get_tx_stats,
         .get_tsf                = rt2500pci_get_tsf,
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 6579718f36ad..1933113d7baf 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1776,7 +1776,7 @@ static const struct ieee80211_ops rt2500usb_mac80211_ops = {
         .config_interface       = rt2x00mac_config_interface,
         .configure_filter       = rt2500usb_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
-        .erp_ie_changed         = rt2x00mac_erp_ie_changed,
+        .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
         .get_tx_stats           = rt2x00mac_get_tx_stats,
         .beacon_update          = rt2500usb_beacon_update,
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 94a8a7ce5382..05927b908f80 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -936,8 +936,10 @@ int rt2x00mac_get_stats(struct ieee80211_hw *hw,
                         struct ieee80211_low_level_stats *stats);
 int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw,
                            struct ieee80211_tx_queue_stats *stats);
-void rt2x00mac_erp_ie_changed(struct ieee80211_hw *hw, u8 changes,
-                              int cts_protection, int preamble);
+void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ieee80211_bss_conf *bss_conf,
+                                u32 changes);
 int rt2x00mac_conf_tx(struct ieee80211_hw *hw, int queue,
                       const struct ieee80211_tx_queue_params *params);
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index b26c634f210b..72cfe6f866f8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -481,10 +481,17 @@ static void rt2x00lib_configuration_scheduled(struct work_struct *work)
 {
         struct rt2x00_dev *rt2x00dev =
             container_of(work, struct rt2x00_dev, config_work);
-        int preamble = !test_bit(CONFIG_SHORT_PREAMBLE, &rt2x00dev->flags);
+        struct ieee80211_bss_conf bss_conf;
 
-        rt2x00mac_erp_ie_changed(rt2x00dev->hw,
-                                 IEEE80211_ERP_CHANGE_PREAMBLE, 0, preamble);
+        bss_conf.use_short_preamble =
+                test_bit(CONFIG_SHORT_PREAMBLE, &rt2x00dev->flags);
+
+        /*
+         * FIXME: shouldn't invoke it this way because all other contents
+         *        of bss_conf is invalid.
+         */
+        rt2x00mac_bss_info_changed(rt2x00dev->hw, rt2x00dev->interface.id,
+                                   &bss_conf, BSS_CHANGED_ERP_PREAMBLE);
 }
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 1d67bcd46bcb..e3f15e518c76 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -342,23 +342,27 @@ int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_get_tx_stats);
 
-void rt2x00mac_erp_ie_changed(struct ieee80211_hw *hw, u8 changes,
-                              int cts_protection, int preamble)
+void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ieee80211_bss_conf *bss_conf,
+                                u32 changes)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         int short_preamble;
         int ack_timeout;
         int ack_consume_time;
         int difs;
+        int preamble;
 
         /*
          * We only support changing preamble mode.
          */
-        if (!(changes & IEEE80211_ERP_CHANGE_PREAMBLE))
+        if (!(changes & BSS_CHANGED_ERP_PREAMBLE))
                 return;
 
-        short_preamble = !preamble;
-        preamble = !!(preamble) ? PREAMBLE : SHORT_PREAMBLE;
+        short_preamble = bss_conf->use_short_preamble;
+        preamble = bss_conf->use_short_preamble ?
+                                SHORT_PREAMBLE : PREAMBLE;
 
         difs = (hw->conf.flags & IEEE80211_CONF_SHORT_SLOT_TIME) ?
                 SHORT_DIFS : DIFS;
@@ -374,7 +378,7 @@ void rt2x00mac_erp_ie_changed(struct ieee80211_hw *hw, u8 changes,
         rt2x00dev->ops->lib->config_preamble(rt2x00dev, short_preamble,
                                              ack_timeout, ack_consume_time);
 }
-EXPORT_SYMBOL_GPL(rt2x00mac_erp_ie_changed);
+EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed);
 
 int rt2x00mac_conf_tx(struct ieee80211_hw *hw, int queue,
                       const struct ieee80211_tx_queue_params *params)
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 88d169800886..ab52f221cd71 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2441,7 +2441,7 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = {
         .configure_filter       = rt61pci_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
         .set_retry_limit        = rt61pci_set_retry_limit,
-        .erp_ie_changed         = rt2x00mac_erp_ie_changed,
+        .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
         .get_tx_stats           = rt2x00mac_get_tx_stats,
         .get_tsf                = rt61pci_get_tsf,
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 47ed3070ae0b..f9518764aeb0 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -2024,7 +2024,7 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = {
         .configure_filter       = rt73usb_configure_filter,
         .get_stats              = rt2x00mac_get_stats,
         .set_retry_limit        = rt73usb_set_retry_limit,
-        .erp_ie_changed         = rt2x00mac_erp_ie_changed,
+        .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
         .get_tx_stats           = rt2x00mac_get_tx_stats,
         .get_tsf                = rt73usb_get_tsf,
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 3409cf97f5f8..49127e4b42c2 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -849,17 +849,19 @@ static void set_rts_cts_work(struct work_struct *work)
         mutex_unlock(&mac->chip.mutex);
 }
 
-static void zd_op_erp_ie_changed(struct ieee80211_hw *hw, u8 changes,
-                                 int cts_protection, int preamble)
+static void zd_op_bss_info_changed(struct ieee80211_hw *hw,
+                                   struct ieee80211_vif *vif,
+                                   struct ieee80211_bss_conf *bss_conf,
+                                   u32 changes)
 {
         struct zd_mac *mac = zd_hw_mac(hw);
         unsigned long flags;
 
         dev_dbg_f(zd_mac_dev(mac), "changes: %x\n", changes);
 
-        if (changes & IEEE80211_ERP_CHANGE_PREAMBLE) {
+        if (changes & BSS_CHANGED_ERP_PREAMBLE) {
                 spin_lock_irqsave(&mac->lock, flags);
-                mac->short_preamble = !preamble;
+                mac->short_preamble = bss_conf->use_short_preamble;
                 if (!mac->updating_rts_rate) {
                         mac->updating_rts_rate = 1;
                         /* FIXME: should disable TX here, until work has
@@ -879,7 +881,7 @@ static const struct ieee80211_ops zd_ops = {
         .config                 = zd_op_config,
         .config_interface       = zd_op_config_interface,
         .configure_filter       = zd_op_configure_filter,
-        .erp_ie_changed         = zd_op_erp_ie_changed,
+        .bss_info_changed       = zd_op_bss_info_changed,
 };
 
 struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 8a49c06dfd38..9083bafb63ca 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -275,6 +275,43 @@ struct ieee80211_low_level_stats {
         unsigned int dot11RTSSuccessCount;
 };
 
+/**
+ * enum ieee80211_bss_change - BSS change notification flags
+ *
+ * These flags are used with the bss_info_changed() callback
+ * to indicate which BSS parameter changed.
+ *
+ * @BSS_CHANGED_ASSOC: association status changed (associated/disassociated),
+ *      also implies a change in the AID.
+ * @BSS_CHANGED_ERP_CTS_PROT: CTS protection changed
+ * @BSS_CHANGED_ERP_PREAMBLE: preamble changed
+ */
+enum ieee80211_bss_change {
+        BSS_CHANGED_ASSOC               = 1<<0,
+        BSS_CHANGED_ERP_CTS_PROT        = 1<<1,
+        BSS_CHANGED_ERP_PREAMBLE        = 1<<2,
+};
+
+/**
+ * struct ieee80211_bss_conf - holds the BSS's changing parameters
+ *
+ * This structure keeps information about a BSS (and an association
+ * to that BSS) that can change during the lifetime of the BSS.
+ *
+ * @assoc: association status
+ * @aid: association ID number, valid only when @assoc is true
+ * @use_cts_prot: use CTS protection
+ * @use_short_preamble: use 802.11b short preamble
+ */
+struct ieee80211_bss_conf {
+        /* association related data */
+        bool assoc;
+        u16 aid;
+        /* erp related data */
+        bool use_cts_prot;
+        bool use_short_preamble;
+};
+
 /* Transmit control fields. This data structure is passed to low-level driver
  * with each TX frame. The low-level driver is responsible for configuring
  * the hardware to use given values (depending on what is supported). */
@@ -924,19 +961,6 @@ enum ieee80211_filter_flags {
 };
 
 /**
- * enum ieee80211_erp_change_flags - erp change flags
- *
- * These flags are used with the erp_ie_changed() callback in
- * &struct ieee80211_ops to indicate which parameter(s) changed.
- * @IEEE80211_ERP_CHANGE_PROTECTION: protection changed
- * @IEEE80211_ERP_CHANGE_PREAMBLE: barker preamble mode changed
- */
-enum ieee80211_erp_change_flags {
-        IEEE80211_ERP_CHANGE_PROTECTION = 1<<0,
-        IEEE80211_ERP_CHANGE_PREAMBLE   = 1<<1,
-};
-
-/**
  * enum ieee80211_ampdu_mlme_action - A-MPDU actions
  *
  * These flags are used with the ampdu_action() callback in
@@ -1004,6 +1028,14 @@ enum ieee80211_ampdu_mlme_action {
  * @config_interface: Handler for configuration requests related to interfaces
  *      (e.g. BSSID changes.)
  *
+ * @bss_info_changed: Handler for configuration requests related to BSS
+ *      parameters that may vary during BSS's lifespan, and may affect low
+ *      level driver (e.g. assoc/disassoc status, erp parameters).
+ *      This function should not be used if no BSS has been set, unless
+ *      for association indication. The @changed parameter indicates which
+ *      of the bss parameters has changed when a call is made. This callback
+ *      has to be atomic.
+ *
  * @configure_filter: Configure the device's RX filter.
  *      See the section "Frame filtering" for more information.
  *      This callback must be implemented and atomic.
@@ -1038,8 +1070,6 @@ enum ieee80211_ampdu_mlme_action {
  * @sta_notify: Notifies low level driver about addition or removal
  *      of assocaited station or AP.
  *
- * @erp_ie_changed: Handle ERP IE change notifications. Must be atomic.
- *
  * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
  *      bursting) for a hardware TX queue. The @queue parameter uses the
  *      %IEEE80211_TX_QUEUE_* constants. Must be atomic.
@@ -1096,6 +1126,10 @@ struct ieee80211_ops {
         int (*config_interface)(struct ieee80211_hw *hw,
                                 struct ieee80211_vif *vif,
                                 struct ieee80211_if_conf *conf);
+        void (*bss_info_changed)(struct ieee80211_hw *hw,
+                                 struct ieee80211_vif *vif,
+                                 struct ieee80211_bss_conf *info,
+                                 u32 changed);
         void (*configure_filter)(struct ieee80211_hw *hw,
                                  unsigned int changed_flags,
                                  unsigned int *total_flags,
@@ -1115,8 +1149,6 @@ struct ieee80211_ops {
                                u32 short_retry, u32 long_retr);
         void (*sta_notify)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                         enum sta_notify_cmd, const u8 *addr);
-        void (*erp_ie_changed)(struct ieee80211_hw *hw, u8 changes,
-                               int cts_protection, int preamble);
         int (*conf_tx)(struct ieee80211_hw *hw, int queue,
                        const struct ieee80211_tx_queue_params *params);
         int (*get_tx_stats)(struct ieee80211_hw *hw,
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index 3500fe0d380b..829872a3ae81 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -118,7 +118,7 @@ static ssize_t ieee80211_if_fmt_flags(
                  sdata->u.sta.flags & IEEE80211_STA_AUTHENTICATED ? "AUTH\n" : "",
                  sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED ? "ASSOC\n" : "",
                  sdata->u.sta.flags & IEEE80211_STA_PROBEREQ_POLL ? "PROBEREQ POLL\n" : "",
-                 sdata->flags & IEEE80211_SDATA_USE_PROTECTION ? "CTS prot\n" : "");
+                 sdata->bss_conf.use_cts_prot ? "CTS prot\n" : "");
 }
 __IEEE80211_IF_FILE(flags);
 
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 859682eee547..177040218232 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -635,25 +635,30 @@ int ieee80211_hw_config_ht(struct ieee80211_local *local, int enable_ht,
         return 0;
 }
 
-void ieee80211_erp_info_change_notify(struct net_device *dev, u8 changes)
+void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
+                                      u32 changed)
 {
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        if (local->ops->erp_ie_changed)
-                local->ops->erp_ie_changed(local_to_hw(local), changes,
-                        !!(sdata->flags & IEEE80211_SDATA_USE_PROTECTION),
-                        !(sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE));
+        struct ieee80211_local *local = sdata->local;
+
+        if (!changed)
+                return;
+
+        if (local->ops->bss_info_changed)
+                local->ops->bss_info_changed(local_to_hw(local),
+                                             &sdata->vif,
+                                             &sdata->bss_conf,
+                                             changed);
 }
 
 void ieee80211_reset_erp_info(struct net_device *dev)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-        sdata->flags &= ~(IEEE80211_SDATA_USE_PROTECTION |
-                        IEEE80211_SDATA_SHORT_PREAMBLE);
-        ieee80211_erp_info_change_notify(dev,
-                                         IEEE80211_ERP_CHANGE_PROTECTION |
-                                         IEEE80211_ERP_CHANGE_PREAMBLE);
+        sdata->bss_conf.use_cts_prot = 0;
+        sdata->bss_conf.use_short_preamble = 0;
+        ieee80211_bss_info_change_notify(sdata,
+                                         BSS_CHANGED_ERP_CTS_PROT |
+                                         BSS_CHANGED_ERP_PREAMBLE);
 }
 
 void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 08a6c0cff690..72ecbf7bf962 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -291,12 +291,7 @@ struct ieee80211_if_sta {
 /* flags used in struct ieee80211_sub_if_data.flags */
 #define IEEE80211_SDATA_ALLMULTI        BIT(0)
 #define IEEE80211_SDATA_PROMISC         BIT(1)
-#define IEEE80211_SDATA_USE_PROTECTION  BIT(2) /* CTS protect ERP frames */
-/* use short preamble with IEEE 802.11b: this flag is set when the AP or beacon
- * generator reports that there are no present stations that cannot support short
- * preambles */
-#define IEEE80211_SDATA_SHORT_PREAMBLE  BIT(3)
-#define IEEE80211_SDATA_USERSPACE_MLME  BIT(4)
+#define IEEE80211_SDATA_USERSPACE_MLME  BIT(2)
 struct ieee80211_sub_if_data {
         struct list_head list;
 
@@ -327,6 +322,15 @@ struct ieee80211_sub_if_data {
         struct ieee80211_key *keys[NUM_DEFAULT_KEYS];
         struct ieee80211_key *default_key;
 
+        /*
+         * BSS configuration for this interface.
+         *
+         * FIXME: I feel bad putting this here when we already have a
+         *        bss pointer, but the bss pointer is just wrong when
+         *        you have multiple virtual STA mode interfaces...
+         *        This needs to be fixed.
+         */
+        struct ieee80211_bss_conf bss_conf;
         struct ieee80211_if_ap *bss; /* BSS that this device belongs to */
 
         union {
@@ -770,7 +774,8 @@ struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
                                          u8 *addr);
 int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason);
 int ieee80211_sta_disassociate(struct net_device *dev, u16 reason);
-void ieee80211_erp_info_change_notify(struct net_device *dev, u8 changes);
+void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
+                                      u32 changed);
 void ieee80211_reset_erp_info(struct net_device *dev);
 int ieee80211_ht_cap_ie_to_ht_info(struct ieee80211_ht_cap *ht_cap_ie,
                                    struct ieee80211_ht_info *ht_info);
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index b1e7d17ee253..866eb8078121 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -313,48 +313,42 @@ static void ieee80211_sta_wmm_params(struct net_device *dev,
 }
 
 
-static void ieee80211_handle_erp_ie(struct net_device *dev, u8 erp_value)
+static u32 ieee80211_handle_erp_ie(struct ieee80211_sub_if_data *sdata,
+                                   u8 erp_value)
 {
-        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf;
         struct ieee80211_if_sta *ifsta = &sdata->u.sta;
-        int use_protection = (erp_value & WLAN_ERP_USE_PROTECTION) != 0;
-        int preamble_mode = (erp_value & WLAN_ERP_BARKER_PREAMBLE) != 0;
-        u8 changes = 0;
+        bool use_protection = (erp_value & WLAN_ERP_USE_PROTECTION) != 0;
+        bool preamble_mode = (erp_value & WLAN_ERP_BARKER_PREAMBLE) != 0;
         DECLARE_MAC_BUF(mac);
+        u32 changed = 0;
 
-        if (use_protection != !!(sdata->flags & IEEE80211_SDATA_USE_PROTECTION)) {
+        if (use_protection != bss_conf->use_cts_prot) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: CTS protection %s (BSSID="
                                "%s)\n",
-                               dev->name,
+                               sdata->dev->name,
                                use_protection ? "enabled" : "disabled",
                                print_mac(mac, ifsta->bssid));
                 }
-                if (use_protection)
-                        sdata->flags |= IEEE80211_SDATA_USE_PROTECTION;
-                else
-                        sdata->flags &= ~IEEE80211_SDATA_USE_PROTECTION;
-                changes |= IEEE80211_ERP_CHANGE_PROTECTION;
+                bss_conf->use_cts_prot = use_protection;
+                changed |= BSS_CHANGED_ERP_CTS_PROT;
         }
 
-        if (preamble_mode != !(sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE)) {
+        if (preamble_mode != bss_conf->use_short_preamble) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: switched to %s barker preamble"
                                " (BSSID=%s)\n",
-                               dev->name,
+                               sdata->dev->name,
                                (preamble_mode == WLAN_ERP_PREAMBLE_SHORT) ?
                                         "short" : "long",
                                print_mac(mac, ifsta->bssid));
                 }
-                if (preamble_mode)
-                        sdata->flags &= ~IEEE80211_SDATA_SHORT_PREAMBLE;
-                else
-                        sdata->flags |= IEEE80211_SDATA_SHORT_PREAMBLE;
-                changes |= IEEE80211_ERP_CHANGE_PREAMBLE;
+                bss_conf->use_short_preamble = preamble_mode;
+                changed |= BSS_CHANGED_ERP_PREAMBLE;
         }
 
-        if (changes)
-                ieee80211_erp_info_change_notify(dev, changes);
+        return changed;
 }
 
 int ieee80211_ht_cap_ie_to_ht_info(struct ieee80211_ht_cap *ht_cap_ie,
@@ -458,19 +452,16 @@ static void ieee80211_set_associated(struct net_device *dev,
                                      struct ieee80211_if_sta *ifsta,
                                      bool assoc)
 {
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = sdata->local;
         union iwreq_data wrqu;
-
-        if (!!(ifsta->flags & IEEE80211_STA_ASSOCIATED) == assoc)
-                return;
+        u32 changed = BSS_CHANGED_ASSOC;
 
         if (assoc) {
-                struct ieee80211_sub_if_data *sdata;
                 struct ieee80211_sta_bss *bss;
 
                 ifsta->flags |= IEEE80211_STA_ASSOCIATED;
 
-                sdata = IEEE80211_DEV_TO_SUB_IF(dev);
                 if (sdata->vif.type != IEEE80211_IF_TYPE_STA)
                         return;
 
@@ -479,7 +470,8 @@ static void ieee80211_set_associated(struct net_device *dev,
                                            ifsta->ssid, ifsta->ssid_len);
                 if (bss) {
                         if (bss->has_erp_value)
-                                ieee80211_handle_erp_ie(dev, bss->erp_value);
+                                changed |= ieee80211_handle_erp_ie(
+                                                sdata, bss->erp_value);
                         ieee80211_rx_bss_put(dev, bss);
                 }
 
@@ -499,6 +491,8 @@ static void ieee80211_set_associated(struct net_device *dev,
         wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
         ifsta->last_probe = jiffies;
         ieee80211_led_assoc(local, assoc);
+
+        ieee80211_bss_info_change_notify(sdata, changed);
 }
 
 static void ieee80211_set_disassoc(struct net_device *dev,
@@ -1536,18 +1530,20 @@ static void ieee80211_rx_mgmt_disassoc(struct net_device *dev,
 }
 
 
-static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev,
+static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                                          struct ieee80211_if_sta *ifsta,
                                          struct ieee80211_mgmt *mgmt,
                                          size_t len,
                                          int reassoc)
 {
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_local *local = sdata->local;
+        struct net_device *dev = sdata->dev;
         struct ieee80211_hw_mode *mode;
         struct sta_info *sta;
         u32 rates;
         u16 capab_info, status_code, aid;
         struct ieee802_11_elems elems;
+        struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf;
         u8 *pos;
         int i, j;
         DECLARE_MAC_BUF(mac);
@@ -1620,6 +1616,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev,
         if (ifsta->assocresp_ies)
                 memcpy(ifsta->assocresp_ies, pos, ifsta->assocresp_ies_len);
 
+        /* set AID, ieee80211_set_associated() will tell the driver */
+        bss_conf->aid = aid;
         ieee80211_set_associated(dev, ifsta, 1);
 
         /* Add STA entry for the AP */
@@ -2099,6 +2097,7 @@ static void ieee80211_rx_mgmt_beacon(struct net_device *dev,
         struct ieee802_11_elems elems;
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct ieee80211_conf *conf = &local->hw.conf;
+        u32 changed = 0;
 
         ieee80211_rx_bss_info(dev, mgmt, len, rx_status, 1);
 
@@ -2119,7 +2118,7 @@ static void ieee80211_rx_mgmt_beacon(struct net_device *dev,
         ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen, &elems);
 
         if (elems.erp_info && elems.erp_info_len >= 1)
-                ieee80211_handle_erp_ie(dev, elems.erp_info[0]);
+                changed |= ieee80211_handle_erp_ie(sdata, elems.erp_info[0]);
 
         if (elems.ht_cap_elem && elems.ht_info_elem &&
             elems.wmm_param && local->ops->conf_ht &&
@@ -2142,6 +2141,8 @@ static void ieee80211_rx_mgmt_beacon(struct net_device *dev,
                 ieee80211_sta_wmm_params(dev, ifsta, elems.wmm_param,
                                          elems.wmm_param_len);
         }
+
+        ieee80211_bss_info_change_notify(sdata, changed);
 }
 
 
@@ -2329,10 +2330,10 @@ static void ieee80211_sta_rx_queued_mgmt(struct net_device *dev,
                 ieee80211_rx_mgmt_auth(dev, ifsta, mgmt, skb->len);
                 break;
         case IEEE80211_STYPE_ASSOC_RESP:
-                ieee80211_rx_mgmt_assoc_resp(dev, ifsta, mgmt, skb->len, 0);
+                ieee80211_rx_mgmt_assoc_resp(sdata, ifsta, mgmt, skb->len, 0);
                 break;
         case IEEE80211_STYPE_REASSOC_RESP:
-                ieee80211_rx_mgmt_assoc_resp(dev, ifsta, mgmt, skb->len, 1);
+                ieee80211_rx_mgmt_assoc_resp(sdata, ifsta, mgmt, skb->len, 1);
                 break;
         case IEEE80211_STYPE_DEAUTH:
                 ieee80211_rx_mgmt_deauth(dev, ifsta, mgmt, skb->len);
@@ -2787,7 +2788,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
                         break;
                 }
                 control.tx_rate =
-                        ((sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE) &&
+                        (sdata->bss_conf.use_short_preamble &&
                         (ratesel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
                         ratesel.rate->val2 : ratesel.rate->val;
                 control.antenna_sel_tx = local->hw.conf.antenna_sel_tx;
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 51c0f00d02d1..f9088fe34d59 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -176,7 +176,7 @@ static u16 ieee80211_duration(struct ieee80211_txrx_data *tx, int group_addr,
          * to closest integer */
 
         dur = ieee80211_frame_duration(local, 10, rate, erp,
-                       tx->sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE);
+                                tx->sdata->bss_conf.use_short_preamble);
 
         if (next_frag_len) {
                 /* Frame is fragmented: duration increases with time needed to
@@ -185,8 +185,7 @@ static u16 ieee80211_duration(struct ieee80211_txrx_data *tx, int group_addr,
                 /* next fragment */
                 dur += ieee80211_frame_duration(local, next_frag_len,
                                 txrate->rate, erp,
-                                tx->sdata->flags &
-                                        IEEE80211_SDATA_SHORT_PREAMBLE);
+                                tx->sdata->bss_conf.use_short_preamble);
         }
 
         return dur;
@@ -605,7 +604,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_txrx_data *tx)
                 tx->u.tx.control->alt_retry_rate = -1;
 
         if (tx->u.tx.mode->mode == MODE_IEEE80211G &&
-            (tx->sdata->flags & IEEE80211_SDATA_USE_PROTECTION) &&
+            tx->sdata->bss_conf.use_cts_prot &&
             (tx->flags & IEEE80211_TXRXD_FRAGMENTED) && rsel.nonerp) {
                 tx->u.tx.last_frag_rate = tx->u.tx.rate;
                 if (rsel.probe)
@@ -667,7 +666,7 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
         if (mode->mode == MODE_IEEE80211G &&
             (tx->u.tx.rate->flags & IEEE80211_RATE_ERP) &&
             (tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
-            (tx->sdata->flags & IEEE80211_SDATA_USE_PROTECTION) &&
+            tx->sdata->bss_conf.use_cts_prot &&
             !(control->flags & IEEE80211_TXCTL_USE_RTS_CTS))
                 control->flags |= IEEE80211_TXCTL_USE_CTS_PROTECT;
 
@@ -676,7 +675,7 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
          * available on the network at the current point in time. */
         if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
             (tx->u.tx.rate->flags & IEEE80211_RATE_PREAMBLE2) &&
-            (tx->sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE) &&
+            tx->sdata->bss_conf.use_short_preamble &&
             (!tx->sta || (tx->sta->flags & WLAN_STA_SHORT_PREAMBLE))) {
                 tx->u.tx.control->tx_rate = tx->u.tx.rate->val2;
         }
@@ -1754,7 +1753,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
                 }
 
                 control->tx_rate =
-                        ((sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE) &&
+                        (sdata->bss_conf.use_short_preamble &&
                         (rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
                         rsel.rate->val2 : rsel.rate->val;
                 control->antenna_sel_tx = local->hw.conf.antenna_sel_tx;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index ba81cf542818..5e631ce98d7e 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -312,8 +312,8 @@ __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
         int erp;
 
         erp = ieee80211_is_erp_rate(hw->conf.phymode, rate);
-        dur = ieee80211_frame_duration(local, frame_len, rate,
-                       erp, sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE);
+        dur = ieee80211_frame_duration(local, frame_len, rate, erp,
+                                       sdata->bss_conf.use_short_preamble);
 
         return cpu_to_le16(dur);
 }
@@ -326,11 +326,11 @@ __le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
         struct ieee80211_local *local = hw_to_local(hw);
         struct ieee80211_rate *rate;
         struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
-        int short_preamble;
+        bool short_preamble;
         int erp;
         u16 dur;
 
-        short_preamble = sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE;
+        short_preamble = sdata->bss_conf.use_short_preamble;
 
         rate = frame_txctl->rts_rate;
         erp = !!(rate->flags & IEEE80211_RATE_ERP);
@@ -357,11 +357,11 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
         struct ieee80211_local *local = hw_to_local(hw);
         struct ieee80211_rate *rate;
         struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
-        int short_preamble;
+        bool short_preamble;
         int erp;
         u16 dur;
 
-        short_preamble = sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE;
+        short_preamble = sdata->bss_conf.use_short_preamble;
 
         rate = frame_txctl->rts_rate;
         erp = !!(rate->flags & IEEE80211_RATE_ERP);