From 2a7b5850f41ace3db1c27e74196dc9b517f38c21 Mon Sep 17 00:00:00 2001 From: Thomas Pedersen Date: Fri, 3 Aug 2012 12:21:32 -0700 Subject: [PATCH] --- yaml --- r: 327645 b: refs/heads/master c: 0d466b9c6798d431141ab15ae6d5ea413b4d09b2 h: refs/heads/master i: 327643: cbfb0d939090383ccf2f6c5b61ab51b0f417bf10 v: v3 --- [refs] | 2 +- trunk/net/mac80211/iface.c | 8 -------- trunk/net/mac80211/mesh.c | 6 +++++- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 2ea2218905a4..316532a17850 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19c3b8303d4686aa373c669ee833609b3fb403cc +refs/heads/master: 0d466b9c6798d431141ab15ae6d5ea413b4d09b2 diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index 2d6ac78971ea..5a81577879ed 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/net/mac80211/iface.c @@ -777,14 +777,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, synchronize_rcu(); skb_queue_purge(&sdata->skb_queue); - /* - * Disable beaconing here for mesh only, AP and IBSS - * are already taken care of. - */ - if (sdata->vif.type == NL80211_IFTYPE_MESH_POINT) - ieee80211_bss_info_change_notify(sdata, - BSS_CHANGED_BEACON_ENABLED); - /* * Free all remaining keys, there shouldn't be any, * except maybe group keys in AP more or WDS? diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c index 571d5183060e..035cd0c8ce33 100644 --- a/trunk/net/mac80211/mesh.c +++ b/trunk/net/mac80211/mesh.c @@ -621,9 +621,13 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) netif_carrier_off(sdata->dev); + /* stop the beacon */ ifmsh->mesh_id_len = 0; ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED); - sta_info_flush(local, NULL); + + /* flush STAs and mpaths on this iface */ + sta_info_flush(sdata->local, sdata); + mesh_path_flush_by_iface(sdata); del_timer_sync(&sdata->u.mesh.housekeeping_timer); del_timer_sync(&sdata->u.mesh.mesh_path_root_timer);