mac80211/cfg80211 BSS handling improvements
Subsystems (2)
Johannes Berg
maintainercover mac80211/cfg80211 BSS handling improvements
This is my previous RFC series, now split up by functionality and with proper changelogs.
johannes
Johannes Berg
maintainerPATCH 1/4 mac80211: dont add BSS when creating IBSS
There's no need to create a BSS struct only to pass it to ieee80211_sta_join_ibss, so refactor this function into __ieee80211_sta_join_ibss which takes all the relevant paramters, and ieee80211_sta_join_ibss which takes a BSS struct (used when joining an IBSS that already has other members).
--- net/mac80211/ieee80211_i.h | 3 - net/mac80211/mlme.c | 107 ++++++++++++++++++++++++--------------------- net/mac80211/scan.c | 8 --- 3 files changed, 60 insertions(+), 58 deletions(-)
net/mac80211/mlme.c +58 -49
@@ -513,14 +513,15 @@ static void ieee80211_send_deauth_disass/* MLME */ static void ieee80211_sta_def_wmm_params (struct ieee80211_sub_if_data *sdata, -struct ieee80211_bss *bss) +const size_t supp_rates_len, +const u8 *supp_rates) {struct ieee80211_local *local = sdata->local;int i, have_higher_than_11mbit =0 ;/* cf. IEEE 802.11 9.2.12 */ -for (i =0 ; i < bss->supp_rates_len; i++) -if ((bss->supp_rates[i] &0x7f ) *5 >110 ) +for (i =0 ; i < supp_rates_len; i++) +if ((supp_rates[i] &0x7f ) *5 >110 ) have_higher_than_11mbit =1 ; if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ &&
@@ -1516,9 +1517,13 @@ static void ieee80211_rx_mgmt_assoc_resp } -static int ieee80211_sta_join_ibss (struct ieee80211_sub_if_data *sdata, -struct ieee80211_if_sta *ifsta, -struct ieee80211_bss *bss) +static int __ieee80211_sta_join_ibss (struct ieee80211_sub_if_data *sdata, +struct ieee80211_if_sta *ifsta, +const u8 *bssid,const int beacon_int, +const int freq, +const size_t supp_rates_len, +const u8 *supp_rates, +const u16 capability) {struct ieee80211_local *local = sdata->local;int res =0 , rates, i, j;
@@ -1534,7 +1539,7 @@ static int ieee80211_sta_join_ibss(struc }if ((ifsta->flags &IEEE80211_STA_PREV_BSSID_SET ) && -memcmp (ifsta->bssid, bss->bssid,ETH_ALEN ) ==0 ) +memcmp (ifsta->bssid, bssid,ETH_ALEN ) ==0 )return res; skb = dev_alloc_skb(local->hw.extra_tx_headroom + 400 +
@@ -1545,28 +1550,28 @@ static int ieee80211_sta_join_ibss(strucreturn -ENOMEM ; } - sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; -if (!(ifsta->flags &IEEE80211_STA_PREV_BSSID_SET )) {/* Remove possible STA entries from other IBSS networks. */ sta_info_flush_delayed (sdata); } -memcpy (ifsta->bssid, bss->bssid,ETH_ALEN ); +memcpy (ifsta->bssid, bssid,ETH_ALEN ); res =ieee80211_if_config (sdata,IEEE80211_IFCC_BSSID );if (res)return res; - local->hw.conf.beacon_int = bss->beacon_int >=10 ? bss->beacon_int :10 ; + local->hw.conf.beacon_int = beacon_int >=10 ? beacon_int :10 ; - sdata->drop_unencrypted = bss->capability & + sdata->drop_unencrypted = capability &WLAN_CAPABILITY_PRIVACY ?1 :0 ; - res =ieee80211_set_freq (sdata, bss->freq); + res =ieee80211_set_freq (sdata, freq);if (res)return res; + sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; +/* Build IBSS probe response */ skb_reserve (skb, local->hw.extra_tx_headroom);
@@ -1575,33 +1580,32 @@ static int ieee80211_sta_join_ibss(strucskb_put (skb,24 +sizeof (mgmt->u.beacon));memset (mgmt,0 ,24 +sizeof (mgmt->u.beacon)); mgmt->frame_control =cpu_to_le16 (IEEE80211_FTYPE_MGMT | -IEEE80211_STYPE_PROBE_RESP ); +IEEE80211_STYPE_PROBE_RESP );memset (mgmt->da,0xff ,ETH_ALEN );memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN );memcpy (mgmt->bssid, ifsta->bssid,ETH_ALEN ); mgmt->u.beacon.beacon_int =cpu_to_le16 (local->hw.conf.beacon_int); - mgmt->u.beacon.timestamp =cpu_to_le64 (bss->timestamp); - mgmt->u.beacon.capab_info =cpu_to_le16 (bss->capability); + mgmt->u.beacon.capab_info =cpu_to_le16 (capability); pos =skb_put (skb,2 + ifsta->ssid_len); *pos++ =WLAN_EID_SSID ; *pos++ = ifsta->ssid_len;memcpy (pos, ifsta->ssid, ifsta->ssid_len); - rates = bss->supp_rates_len; + rates = supp_rates_len;if (rates >8 ) rates =8 ; pos =skb_put (skb,2 + rates); *pos++ =WLAN_EID_SUPP_RATES ; *pos++ = rates; -memcpy (pos, bss->supp_rates, rates); +memcpy (pos, supp_rates, rates); -if (bss->band ==IEEE80211_BAND_2GHZ ) { +if (sband->band ==IEEE80211_BAND_2GHZ ) { pos =skb_put (skb,2 +1 ); *pos++ =WLAN_EID_DS_PARAMS ; *pos++ =1 ; - *pos++ =ieee80211_frequency_to_channel (bss->freq); + *pos++ =ieee80211_frequency_to_channel (freq); } pos =skb_put (skb,2 +2 );
@@ -1611,12 +1615,12 @@ static int ieee80211_sta_join_ibss(struc *pos++ =0 ; *pos++ =0 ; -if (bss->supp_rates_len >8 ) { - rates = bss->supp_rates_len -8 ; +if (supp_rates_len >8 ) { + rates = supp_rates_len -8 ; pos =skb_put (skb,2 + rates); *pos++ =WLAN_EID_EXT_SUPP_RATES ; *pos++ = rates; -memcpy (pos, &bss->supp_rates[8 ], rates); +memcpy (pos, &supp_rates[8 ], rates); } add_extra_ies(skb, sdata->u.sta.ie_proberesp,
@@ -1629,16 +1633,15 @@ static int ieee80211_sta_join_ibss(struc rates =0 ; - sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; -for (i =0 ; i < bss->supp_rates_len; i++) { -int bitrate = (bss->supp_rates[i] &0x7f ) *5 ; +for (i =0 ; i < supp_rates_len; i++) { +int bitrate = (supp_rates[i] &0x7f ) *5 ;for (j =0 ; j < sband->n_bitrates; j++)if (sband->bitrates[j].bitrate == bitrate) rates |=BIT (j); } ifsta->supp_rates_bits[local->hw.conf.channel->band] = rates; -ieee80211_sta_def_wmm_params (sdata, bss); +ieee80211_sta_def_wmm_params (sdata, supp_rates_len, supp_rates); ifsta->flags |=IEEE80211_STA_PREV_BSSID_SET ; ifsta->state =IEEE80211_STA_MLME_IBSS_JOINED ;
@@ -1647,12 +1650,23 @@ static int ieee80211_sta_join_ibss(strucieee80211_led_assoc (local, true);memset (&wrqu,0 ,sizeof (wrqu)); -memcpy (wrqu.ap_addr.sa_data, bss->bssid,ETH_ALEN ); +memcpy (wrqu.ap_addr.sa_data, bssid,ETH_ALEN );wireless_send_event (sdata->dev,SIOCGIWAP , &wrqu,NULL );return res; } +static int ieee80211_sta_join_ibss (struct ieee80211_sub_if_data *sdata, +struct ieee80211_if_sta *ifsta, +struct ieee80211_bss *bss) +{ +return __ieee80211_sta_join_ibss (sdata, ifsta, + bss->bssid, bss->beacon_int, + bss->freq, + bss->supp_rates_len, bss->supp_rates, + bss->capability); +} + static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, struct ieee80211_mgmt *mgmt, size_t len,
@@ -2206,11 +2220,12 @@ static int ieee80211_sta_create_ibss(str struct ieee80211_if_sta *ifsta) {struct ieee80211_local *local = sdata->local; -struct ieee80211_bss *bss;struct ieee80211_supported_band *sband; -u8 bssid[ETH_ALEN ], *pos; +u8 *pos; +u8 bssid[ETH_ALEN ]; +u8 supp_rates[IEEE80211_MAX_SUPP_RATES ]; +u16 capability;int i; -int ret;if (sdata->u.sta.flags &IEEE80211_STA_BSSID_SET ) {memcpy (bssid, ifsta->bssid,ETH_ALEN );
@@ -2228,36 +2243,29 @@ static int ieee80211_sta_create_ibss(strprintk (KERN_DEBUG "%s: Creating new IBSS network, BSSID %pM\n" , sdata->dev->name, bssid); - bss =ieee80211_rx_bss_add (local, bssid, - local->hw.conf.channel->center_freq, - sdata->u.sta.ssid, sdata->u.sta.ssid_len); -if (!bss) -return -ENOMEM ; - - bss->band = local->hw.conf.channel->band; - sband = local->hw.wiphy->bands[bss->band]; + sband = local->hw.wiphy->bands[local->hw.conf.channel->band];if (local->hw.conf.beacon_int ==0 ) local->hw.conf.beacon_int =100 ; - bss->beacon_int = local->hw.conf.beacon_int; - bss->last_update = jiffies; - bss->capability =WLAN_CAPABILITY_IBSS ; + + capability =WLAN_CAPABILITY_IBSS ;if (sdata->default_key) - bss->capability |=WLAN_CAPABILITY_PRIVACY ; + capability |=WLAN_CAPABILITY_PRIVACY ;else sdata->drop_unencrypted =0 ; - bss->supp_rates_len = sband->n_bitrates; - pos = bss->supp_rates; + pos = supp_rates;for (i =0 ; i < sband->n_bitrates; i++) {int rate = sband->bitrates[i].bitrate; *pos++ = (u8) (rate /5 ); } - ret =ieee80211_sta_join_ibss (sdata, ifsta, bss); -ieee80211_rx_bss_put (local, bss); -return ret; +return __ieee80211_sta_join_ibss (sdata, ifsta, + bssid, local->hw.conf.beacon_int, + local->hw.conf.channel->center_freq, + sband->n_bitrates, supp_rates, + capability); }
@@ -2426,7 +2434,8 @@ static int ieee80211_sta_config_auth(strieee80211_sta_set_ssid (sdata, selected->ssid, selected->ssid_len);ieee80211_sta_set_bssid (sdata, selected->bssid); -ieee80211_sta_def_wmm_params (sdata, selected); +ieee80211_sta_def_wmm_params (sdata, selected->supp_rates_len, + selected->supp_rates);if (sdata->u.sta.mfp ==IEEE80211_MFP_REQUIRED ) sdata->u.sta.flags |=IEEE80211_STA_MFP_ENABLED ;else
net/mac80211/scan.c +2 -6
@@ -14,11 +14,7 @@/* TODO: * figure out how to avoid that the "current BSS" expires -* clean up IBSS code (in MLME), see why it adds a BSS to the list -* use cfg80211's BSS handling (depends on IBSS TODO above) -* order BSS list by RSSI(?) ("quality of AP") -* scan result table filtering (by capability (privacy, IBSS/BSS, WPA/RSN IE, -* SSID) +* use cfg80211's BSS handling */ #include <linux/wireless.h>
@@ -107,7 +103,7 @@ static void __ieee80211_rx_bss_hash_del( } } -struct ieee80211_bss * +static struct ieee80211_bss *ieee80211_rx_bss_add (struct ieee80211_local *local,u8 *bssid,int freq,u8 *ssid,u8 ssid_len) {
net/mac80211/ieee80211_i.h +0 -3
@@ -954,9 +954,6 @@ ieee80211_bss_info_update(struct ieee802struct ieee80211_channel *channel, bool beacon);struct ieee80211_bss * -ieee80211_rx_bss_add (struct ieee80211_local *local,u8 *bssid,int freq, -u8 *ssid,u8 ssid_len); -struct ieee80211_bss *ieee80211_rx_bss_get (struct ieee80211_local *local,u8 *bssid,int freq,u8 *ssid,u8 ssid_len); void ieee80211_rx_bss_put(struct ieee80211_local *local,
Re: [PATCH 1/4] mac80211: dont add BSS when creating IBSS
Hello Johannes!
Quoted 3 lines
There's no need to create a BSS struct only to pass it to
ieee80211_sta_join_ibss, so refactor this function into__ieee80211_sta_join_ibss
I think the use of the internal prefix "__" is a little deceptive in th= is case. But this is only cosmetic.
Regards
Alina
--=20
Jetzt 1 Monat kostenlos! GMX FreeDSL - Telefonanschluss + DSL=20 f=FCr nur 17,95 Euro/mtl.!* http://dsl.gmx.de/?ac=3DOM.AD.PD003K11308T4=
569a
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Johannes Berg
maintainerPATCH 2/4 cfg80211: free_priv for BSS info
In reply to Johannes BergWhen cfg80211 users have their own allocated data in the per-BSS private data, they will need to free this when the BSS struct is destroyed. Add a free_priv method and fix one place where the BSS was kfree'd rather than released properly.
--- include/net/cfg80211.h | 2 ++ net/wireless/core.c | 2 +- net/wireless/scan.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-)
include/net/cfg80211.h +2 -0
@@ -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 *)))); };
net/wireless/scan.c +2 -0
@@ -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); }
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); }
Johannes Berg
maintainerPATCH 3/4 cfg80211: add more flexible BSS lookup
In reply to Johannes BergAdd a more flexible BSS lookup function so that mac80211 or other drivers can actually use this for getting the BSS to connect to.
--- include/net/cfg80211.h | 12 +++++++++++- net/wireless/scan.c | 10 ++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-)
include/net/cfg80211.h +11 -1
@@ -785,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/wireless/scan.c +8 -2
@@ -116,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);
@@ -199,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 ;
@@ -207,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)) {
Johannes Berg
maintainerPATCH 4/4 mac80211: use cfg80211s BSS infrastructure
In reply to Johannes BergRemove all the code from mac80211 to keep track of BSSes and use the cfg80211-provided code completely.
--- 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 | 255 +++------------------------------------------ net/mac80211/spectmgmt.c | 7 - 7 files changed, 114 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);
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 +19 -236
317 lines not on this page · raw message
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/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);
Johannes Berg
maintainerRe: [PATCH 4/4] mac80211: use cfg80211s BSS infrastructure
Quoted 4 lines · Johannes Berg
plain text document attachment (027-mac80211-use-cfg80211-bss-infrastructure.patch) Remove all the code from mac80211 to keep track of BSSes and use the cfg80211-provided code completely.
This patch is buggy. It can cause a kref leak and then oops.
johannes