mac80211: use cfg80211's BSS infrastructure
Subsystems (2)
Johannes Berg
maintainerRFC 2/2 mac80211: use cfg80211's BSS infrastructure
Signed-off-by Johannes Berg <[email protected]>
---
Please test! I've tested STA mode (with visible and hidden SSID), but not mesh.
include/net/cfg80211.h | 14 ++ net/mac80211/ieee80211_i.h | 42 ++----- net/mac80211/main.c | 6 - net/mac80211/mesh.c | 10 - net/mac80211/mesh.h | 1 net/mac80211/mlme.c | 211 ++++++++++++------------------------- net/mac80211/scan.c | 250 +++------------------------------------------ net/mac80211/spectmgmt.c | 7 - net/wireless/core.c | 2 net/wireless/scan.c | 12 +- 10 files changed, 137 insertions(+), 418 deletions(-)
net/mac80211/ieee80211_i.h +15 -27
@@ -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 32u8 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; };
@@ -672,9 +665,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 */
@@ -937,8 +927,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);
include/net/cfg80211.h +13 -1
@@ -567,6 +567,7 @@ enum cfg80211_signal_type {* @len_information_elements: total length of the information elements * @signal: signal strength value * @signal_type: signal type +* @free_priv: function pointer to free private data * @priv: private area for driver use, has at least wiphy->bss_priv_size bytes */ struct cfg80211_bss {
@@ -582,6 +583,7 @@ struct cfg80211_bss {s32 signal;enum cfg80211_signal_type signal_type; +void (*free_priv)(struct cfg80211_bss *bss); u8 priv[0] __attribute__((__aligned__(sizeof(void *)))); };
@@ -783,7 +785,17 @@ cfg80211_inform_bss_frame(struct wiphy *struct cfg80211_bss *cfg80211_get_bss (struct wiphy *wiphy,struct ieee80211_channel *channel,const u8 *bssid, -const u8 *ssid,size_t ssid_len); +const u8 *ssid,size_t ssid_len, +u16 capa_mask,u16 capa_val); +static inline struct cfg80211_bss * +cfg80211_get_ibss (struct wiphy *wiphy, +struct ieee80211_channel *channel, +const u8 *ssid,size_t ssid_len) +{ +return cfg80211_get_bss (wiphy, channel,NULL , ssid, ssid_len, +WLAN_CAPABILITY_IBSS ,WLAN_CAPABILITY_IBSS ); +} + struct cfg80211_bss *cfg80211_get_mesh(struct wiphy *wiphy, struct ieee80211_channel *channel, const u8 *meshid, size_t meshidlen,
net/mac80211/main.c +3 -3
@@ -732,6 +732,9 @@ struct ieee80211_hw *ieee80211_alloc_hw( wiphy->privid = mac80211_wiphy_privid; wiphy->max_scan_ssids =4 ; +/* Yes, putting cfg80211_bss into ieee80211_bss is a hack */ + wiphy->bss_priv_size =sizeof (struct ieee80211_bss ) - +sizeof (struct cfg80211_bss ); local =wiphy_priv (wiphy); local->hw.wiphy = wiphy;
@@ -880,8 +883,6 @@ int ieee80211_register_hw(struct ieee802 mpriv->local = local; local->mdev = mdev; -ieee80211_rx_bss_list_init (local); - local->hw.workqueue =create_singlethread_workqueue (wiphy_name (local->hw.wiphy));if (!local->hw.workqueue) {
@@ -1021,7 +1022,6 @@ void ieee80211_unregister_hw(struct ieeertnl_unlock (); -ieee80211_rx_bss_list_deinit (local);ieee80211_clear_tx_pending (local);sta_info_stop (local);rate_control_deinitialize (local);
net/mac80211/scan.c +18 -232
306 lines not on this page · raw message
net/wireless/scan.c +10 -2
@@ -56,6 +56,8 @@ static void bss_release(struct kref *refstruct cfg80211_internal_bss *bss; bss = container_of(ref, struct cfg80211_internal_bss, ref); +if (bss->pub.free_priv) + bss->pub.free_priv (&bss->pub);kfree (bss); }
@@ -114,9 +116,12 @@ static bool is_bss(struct cfg80211_bss * {const u8 *ssidie; -if (compare_ether_addr (a->bssid, bssid)) +if (bssid &&compare_ether_addr (a->bssid, bssid))return false; +if (!ssid) +return true; + ssidie =find_ie (WLAN_EID_SSID , a->information_elements, a->len_information_elements);
@@ -197,7 +202,8 @@ static int cmp_bss(struct cfg80211_bss *struct cfg80211_bss *cfg80211_get_bss (struct wiphy *wiphy,struct ieee80211_channel *channel,const u8 *bssid, -const u8 *ssid,size_t ssid_len) +const u8 *ssid,size_t ssid_len, +u16 capa_mask,u16 capa_val) {struct cfg80211_registered_device *dev =wiphy_to_dev (wiphy);struct cfg80211_internal_bss *bss, *res =NULL ;
@@ -205,6 +211,8 @@ struct cfg80211_bss *cfg80211_get_bss(stspin_lock_bh (&dev->bss_lock);list_for_each_entry (bss, &dev->bss_list, list) { +if ((bss->pub.capability & capa_mask) != capa_val) +continue ;if (channel && bss->pub.channel != channel)continue ;if (is_bss (&bss->pub, bssid, ssid, ssid_len)) {
net/mac80211/mlme.c +72 -139
329 lines not on this page · raw message
net/mac80211/spectmgmt.c +5 -2
@@ -102,8 +102,9 @@ void ieee80211_chswitch_work(struct work goto exit; sdata->local->oper_channel = sdata->local->csa_channel; +/* XXX: shouldn't really modify cfg80211-owned data! */ if (!ieee80211_hw_config (sdata->local,IEEE80211_CONF_CHANGE_CHANNEL )) - bss->freq = sdata->local->oper_channel->center_freq; + bss->cbss.channel = sdata->local->oper_channel;ieee80211_rx_bss_put (sdata->local, bss); exit:
@@ -158,7 +159,9 @@ void ieee80211_process_chanswitch(struct IEEE80211_QUEUE_STOP_REASON_CSA); ifsta->flags |=IEEE80211_STA_CSA_RECEIVED ;mod_timer (&ifsta->chswitch_timer, - jiffies +msecs_to_jiffies (sw_elem->count * bss->beacon_int)); + jiffies + +msecs_to_jiffies (sw_elem->count * + bss->cbss.beacon_interval)); } }
net/wireless/core.c +1 -1
@@ -376,7 +376,7 @@ void cfg80211_dev_free(struct cfg80211_rmutex_destroy (&drv->mtx);mutex_destroy (&drv->devlist_mtx);list_for_each_entry_safe (scan, tmp, &drv->bss_list, list) -kfree (scan); +cfg80211_put_bss (&scan->pub);kfree (drv); }
net/mac80211/mesh.c +0 -10
@@ -275,16 +275,6 @@ u32 mesh_table_hash(u8 *addr, struct iee & tbl->hash_mask; } -u8 mesh_id_hash (u8 *mesh_id,int mesh_id_len) -{ -if (!mesh_id_len) -return 1 ; -else if (mesh_id_len ==1 ) -return (u8 ) mesh_id[0 ]; -else -return (u8) (mesh_id[0 ] +2 * mesh_id[1 ]); -} -struct mesh_table *mesh_table_alloc (int size_order) {int i;
net/mac80211/mesh.h +0 -1
@@ -196,7 +196,6 @@ struct mesh_rmc {/* Public interfaces */ /* Various */ -u8 mesh_id_hash (u8 *mesh_id,int mesh_id_len);int ieee80211_get_mesh_hdrlen (struct ieee80211s_hdr *meshhdr);int ieee80211_new_mesh_header (struct ieee80211s_hdr *meshhdr,struct ieee80211_sub_if_data *sdata);