mac80211: add unified BSS configuration

This patch (based on Ron Rindjunsky's) creates a framework for
a unified way to pass BSS configuration to drivers that require
the information, e.g. for implementing power save mode.

This patch introduces new ieee80211_bss_conf structure that is
passed to the driver via the new bss_info_changed() callback
when the BSS configuration changes.

This new BSS configuration infrastructure adds the following
new features:
 * drivers are notified of their association AID
 * drivers are notified of association status

and replaces the erp_ie_changed() callback. The patch also does
the relevant driver updates for the latter change.

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

1 files changed, 7 insertions, 5 deletions

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)