mac80211: improve cleanup when leaving mesh

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=0d466b9c6798d431141ab15ae6d5ea413b4d09b2
Commit:     0d466b9c6798d431141ab15ae6d5ea413b4d09b2
Parent:     19c3b8303d4686aa373c669ee833609b3fb403cc
Author:     Thomas Pedersen <thomas at cozybit.com>
AuthorDate: Fri Aug 3 12:21:32 2012 -0700
Committer:  Johannes Berg <johannes.berg at intel.com>
CommitDate: Fri Aug 3 21:34:17 2012 +0200

    mac80211: improve cleanup when leaving mesh
    
    It is not necessary to stop the mesh beacon in the mac80211 ndo_stop
    handler, since cfg80211 has already left the mesh on NETDEV_GOING_DOWN
    notification.
    
    Also some improvements to ieee80211_stop_mesh():
    
     - flush mpath entries.
     - flush sta entries per-sdata so we don't remove entries belonging to
       other vifs on the same hw.
    
    Signed-off-by: Thomas Pedersen <thomas at cozybit.com>
    Signed-off-by: Johannes Berg <johannes.berg at intel.com>
---
 net/mac80211/iface.c |    8 --------
 net/mac80211/mesh.c  |    6 +++++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 2d6ac78..5a81577 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -778,14 +778,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
 		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/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 571d518..035cd0c 100644
--- a/net/mac80211/mesh.c
+++ b/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);