mac80211: use cfg80211s BSS infrastructure

Remove all the code from mac80211 to keep track of BSSes
and use the cfg80211-provided code completely.

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

1 files changed, 15 insertions, 27 deletions

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 87d63fe61bf9..678278344d79 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -72,43 +72,36 @@ struct ieee80211_fragment_entry {
 
 
 struct ieee80211_bss {
-        struct list_head list;
-        struct ieee80211_bss *hnext;
-        size_t ssid_len;
+        /* Yes, this is a hack */
+        struct cfg80211_bss cbss;
 
-        atomic_t users;
-
-        u8 bssid[ETH_ALEN];
+        /* don't want to look up all the time */
+        size_t ssid_len;
         u8 ssid[IEEE80211_MAX_SSID_LEN];
+
         u8 dtim_period;
-        u16 capability; /* host byte order */
-        enum ieee80211_band band;
-        int freq;
-        int signal, noise, qual;
-        u8 *ies; /* all information elements from the last Beacon or Probe
-                  * Response frames; note Beacon frame is not allowed to
-                  * override values from Probe Response */
-        size_t ies_len;
+
         bool wmm_used;
+
+        unsigned long last_probe_resp;
+
 #ifdef CONFIG_MAC80211_MESH
         u8 *mesh_id;
         size_t mesh_id_len;
         u8 *mesh_cfg;
 #endif
+
 #define IEEE80211_MAX_SUPP_RATES 32
         u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
         size_t supp_rates_len;
-        u64 timestamp;
-        int beacon_int;
 
-        unsigned long last_probe_resp;
-        unsigned long last_update;
-
-        /* during assocation, we save an ERP value from a probe response so
+        /*
+         * During assocation, we save an ERP value from a probe response so
          * that we can feed ERP info to the driver when handling the
          * association completes. these fields probably won't be up-to-date
-         * otherwise, you probably don't want to use them. */
-        int has_erp_value;
+         * otherwise, you probably don't want to use them.
+         */
+        bool has_erp_value;
         u8 erp_value;
 };
 
@@ -668,9 +661,6 @@ struct ieee80211_local {
         struct ieee80211_sub_if_data *scan_sdata;
         enum nl80211_channel_type oper_channel_type;
         struct ieee80211_channel *oper_channel, *csa_channel;
-        struct list_head bss_list;
-        struct ieee80211_bss *bss_hash[STA_HASH_SIZE];
-        spinlock_t bss_lock;
 
         /* SNMP counters */
         /* dot11CountersTable */
@@ -936,8 +926,6 @@ ieee80211_rx_result
 ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata,
                   struct sk_buff *skb,
                   struct ieee80211_rx_status *rx_status);
-void ieee80211_rx_bss_list_init(struct ieee80211_local *local);
-void ieee80211_rx_bss_list_deinit(struct ieee80211_local *local);
 int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata,
                                char *ie, size_t len);