diff options
author | Jacob Minshall <jacob@cozybit.com> | 2013-05-29 17:32:36 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-03 11:03:18 -0400 |
commit | e05ecccdf752122a439b03c3190458d2c8f0bac6 (patch) | |
tree | d6f791d3507a28ffe6ac3fba22f9b72219981735 /net/mac80211/mesh.h | |
parent | 866403a7bdd3941cbb4e2085d8ac368dcabe800c (diff) |
mac80211: set mesh formation field properly
Cap max peerings at 63 in accordance with IEEE-2012 8.4.2.100.7.
Triggers a beacon regeneration every time the number of peerings changes.
Previously this would only happen if the "accepting peerings" bit changed.
Signed-off-by: Jacob Minshall <jacob@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.h')
-rw-r--r-- | net/mac80211/mesh.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index da158774eebb..8b4d9a3e9eee 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h | |||
@@ -324,14 +324,14 @@ static inline | |||
324 | u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata) | 324 | u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata) |
325 | { | 325 | { |
326 | atomic_inc(&sdata->u.mesh.estab_plinks); | 326 | atomic_inc(&sdata->u.mesh.estab_plinks); |
327 | return mesh_accept_plinks_update(sdata); | 327 | return mesh_accept_plinks_update(sdata) | BSS_CHANGED_BEACON; |
328 | } | 328 | } |
329 | 329 | ||
330 | static inline | 330 | static inline |
331 | u32 mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata) | 331 | u32 mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata) |
332 | { | 332 | { |
333 | atomic_dec(&sdata->u.mesh.estab_plinks); | 333 | atomic_dec(&sdata->u.mesh.estab_plinks); |
334 | return mesh_accept_plinks_update(sdata); | 334 | return mesh_accept_plinks_update(sdata) | BSS_CHANGED_BEACON; |
335 | } | 335 | } |
336 | 336 | ||
337 | static inline int mesh_plink_free_count(struct ieee80211_sub_if_data *sdata) | 337 | static inline int mesh_plink_free_count(struct ieee80211_sub_if_data *sdata) |