mac80211: cache mesh beacon
PATCH v3 1/2 mac80211: cache mesh beacon
Previously, the entire mesh beacon would be generated each time the beacon timer fired. Instead generate a beacon head and tail (so the TIM can easily be inserted when mesh power save is on) when starting a mesh or the MBSS parameters change.
Also add a mutex for protecting beacon updates and preventing leaks.
---
v2:
less verbose, fix RCU usage (Johannes) protect beacon updates (Johannes)
v3:
don't drop ieee80211_mps_set_frame_flags (Marco) fix sparse RCU warnings (Johannes) propagate mesh start failure reason (Johannes)
net/mac80211/cfg.c | 9 +-- net/mac80211/ieee80211_i.h | 3 + net/mac80211/mesh.c | 153 +++++++++++++++++++++++++++++++++++++++++++- net/mac80211/mesh.h | 5 +- net/mac80211/mesh_plink.c | 4 +- net/mac80211/tx.c | 61 +++--------------- 6 files changed, 170 insertions(+), 65 deletions(-)
net/mac80211/cfg.c +3 -6
@@ -1800,11 +1800,10 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy, conf->power_mode = nconf->power_mode;ieee80211_mps_local_status_update (sdata); } -if (_chg_mesh_attr (NL80211_MESHCONF_AWAKE_WINDOW , mask)) { +if (_chg_mesh_attr (NL80211_MESHCONF_AWAKE_WINDOW , mask)) conf->dot11MeshAwakeWindowDuration = nconf->dot11MeshAwakeWindowDuration; -ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON ); - } +ieee80211_mbss_info_change_notify (sdata,BSS_CHANGED_BEACON );return 0 ; }
@@ -1830,9 +1829,7 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev,if (err)return err; -ieee80211_start_mesh (sdata); - -return 0 ; +return ieee80211_start_mesh (sdata); }static int ieee80211_leave_mesh (struct wiphy *wiphy,struct net_device *dev)
net/mac80211/ieee80211_i.h +3 -0
@@ -580,6 +580,9 @@ struct ieee80211_if_mesh {u32 mesh_seqnum;bool accepting_plinks;int num_gates; +struct beacon_data __rcu *beacon; +/* just protects beacon updates for now */ +struct mutex mtx;const u8 *ie;u8 ie_len;enum {
net/mac80211/mesh.c +150 -3
192 lines not on this page · raw message
net/mac80211/mesh.h +4 -1
@@ -239,10 +239,13 @@ void ieee80211s_update_metric(struct ieee80211_local *local, struct sta_info *sta, struct sk_buff *skb);void ieee80211s_stop (void );void ieee80211_mesh_init_sdata (struct ieee80211_sub_if_data *sdata); -void ieee80211_start_mesh (struct ieee80211_sub_if_data *sdata); +int ieee80211_start_mesh (struct ieee80211_sub_if_data *sdata);void ieee80211_stop_mesh (struct ieee80211_sub_if_data *sdata);void ieee80211_mesh_root_setup (struct ieee80211_if_mesh *ifmsh);const struct ieee80211_mesh_sync_ops *ieee80211_mesh_sync_ops_get (u8 method); +/* wrapper for ieee80211_bss_info_change_notify() */ +void ieee80211_mbss_info_change_notify (struct ieee80211_sub_if_data *sdata, +u32 changed);/* mesh power save */ u32 ieee80211_mps_local_status_update (struct ieee80211_sub_if_data *sdata);
net/mac80211/mesh_plink.c +2 -2
@@ -508,7 +508,7 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata,ieee80211_mps_frame_release (sta, elems); out:rcu_read_unlock (); -ieee80211_bss_info_change_notify (sdata, changed); +ieee80211_mbss_info_change_notify (sdata, changed); }static void mesh_plink_timer (unsigned long data)
@@ -1090,5 +1090,5 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_mrcu_read_unlock ();if (changed) -ieee80211_bss_info_change_notify (sdata, changed); +ieee80211_mbss_info_change_notify (sdata, changed); }
net/mac80211/tx.c +8 -53
79 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v3 2/2 mac80211: generate mesh probe responses
Mesh interfaces will now respond to any broadcast (or matching directed mesh) probe requests with a probe response.
---
v2:
less verbose (Johannes)
net/mac80211/mesh.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ net/mac80211/rx.c | 5 +++-- 2 files changed, 63 insertions(+), 2 deletions(-)
net/mac80211/mesh.c +60 -0
@@ -867,6 +867,63 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) sdata->u.mesh.timers_running =0 ; } +static void +ieee80211_mesh_rx_probe_req (struct ieee80211_sub_if_data *sdata, +struct ieee80211_mgmt *mgmt,size_t len) +{ +struct ieee80211_local *local = sdata->local; +struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; +struct sk_buff *presp; +struct beacon_data *bcn; +struct ieee80211_mgmt *hdr; +struct ieee802_11_elems elems; +size_t baselen; +u8 *pos, *end; + + end = ((u8 *) mgmt) + len; + pos = mgmt->u.probe_req.variable; + baselen = (u8 *) pos - (u8 *) mgmt; +if (baselen > len) +return ; + +ieee802_11_parse_elems (pos, len - baselen, &elems); + +/* 802.11-2012 10.1.4.3.2 */ +if ((!ether_addr_equal (mgmt->da, sdata->vif.addr) && + !is_broadcast_ether_addr (mgmt->da)) || + elems.ssid_len !=0 ) +return ; + +if (elems.mesh_id_len !=0 && + (elems.mesh_id_len != ifmsh->mesh_id_len || +memcmp (elems.mesh_id, ifmsh->mesh_id, ifmsh->mesh_id_len))) +return ; + +rcu_read_lock (); + bcn =rcu_dereference (ifmsh->beacon); + +if (!bcn) + goto out; + + presp =dev_alloc_skb (local->tx_headroom + + bcn->head_len + bcn->tail_len); +if (!presp) + goto out; + +skb_reserve (presp, local->tx_headroom); +memcpy (skb_put (presp, bcn->head_len), bcn->head, bcn->head_len); +memcpy (skb_put (presp, bcn->tail_len), bcn->tail, bcn->tail_len); + hdr = (struct ieee80211_mgmt *) presp->data; + hdr->frame_control =cpu_to_le16 (IEEE80211_FTYPE_MGMT | +IEEE80211_STYPE_PROBE_RESP ); +memcpy (hdr->da, mgmt->sa,ETH_ALEN ); +mpl_dbg (sdata,"sending probe resp. to %pM\n" , hdr->da); +IEEE80211_SKB_CB (presp)->flags |=IEEE80211_TX_INTFL_DONT_ENCRYPT ; +ieee80211_tx_skb (sdata, presp); +out: +rcu_read_unlock (); +} + static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, u16 stype, struct ieee80211_mgmt *mgmt,
@@ -956,6 +1013,9 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,ieee80211_mesh_rx_bcn_presp (sdata, stype, mgmt, skb->len, rx_status);break ; +case IEEE80211_STYPE_PROBE_REQ : +ieee80211_mesh_rx_probe_req (sdata, mgmt, skb->len); +break ;case IEEE80211_STYPE_ACTION :ieee80211_mesh_rx_mgmt_action (sdata, mgmt, skb->len, rx_status);break ;
net/mac80211/rx.c +3 -2
@@ -2718,8 +2718,9 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)return RX_DROP_MONITOR ;break ;case cpu_to_le16 (IEEE80211_STYPE_PROBE_REQ ): -/* process only for ibss */ -if (sdata->vif.type !=NL80211_IFTYPE_ADHOC ) +/* process only for ibss and mesh */ +if (sdata->vif.type !=NL80211_IFTYPE_ADHOC && + sdata->vif.type !=NL80211_IFTYPE_MESH_POINT )return RX_DROP_MONITOR ;break ;default :
Signature · 1 line
1.7.10.4
Johannes Berg
maintainerQuoted 8 lines · Thomas Pedersen
Previously, the entire mesh beacon would be generated each time the beacon timer fired. Instead generate a beacon head and tail (so the TIM can easily be inserted when mesh power save is on) when starting a mesh or the MBSS parameters change.
Also add a mutex for protecting beacon updates and preventing leaks.
Applied both, hopefully for good this time ;-)
johannes