mac80211: simplify AP interface stop

For AP interfaces, there's no need to flush stations or keys again when the interface is stopped as already happened when the BSS was stopped on the interface. Signed-off-by: Johannes Berg <johannes.berg@intel.com>

mac80211: simplify AP interface stop
For AP interfaces, there's no need to flush stations or keys again when the interface is stopped as already happened when the BSS was stopped on the interface. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Johannes Berg
1 parent 7b4396bd68
Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff
net/mac80211/iface.c
@@ -836,13 +836,15 @@
 		rcu_barrier();
 		sta_info_flush_cleanup(sdata);
  
-		skb_queue_purge(&sdata->skb_queue);
-
 		/*
 		 * Free all remaining keys, there shouldn't be any,
 		 * except maybe in WDS mode?
 		 */
 		ieee80211_free_keys(sdata);
+
+		/* fall through */
+	case NL80211_IFTYPE_AP:
+		skb_queue_purge(&sdata->skb_queue);
  
 		drv_remove_interface_debugfs(local, sdata);
...	...	@@ -836,13 +836,15 @@
836	836	rcu_barrier();
837	837	sta_info_flush_cleanup(sdata);
838	838
839		- skb_queue_purge(&sdata->skb_queue);
840		-
841	839	/*
842	840	* Free all remaining keys, there shouldn't be any,
843	841	* except maybe in WDS mode?
844	842	*/
845	843	ieee80211_free_keys(sdata);
	844	+
	845	+ /* fall through */
	846	+ case NL80211_IFTYPE_AP:
	847	+ skb_queue_purge(&sdata->skb_queue);
846	848
847	849	drv_remove_interface_debugfs(local, sdata);
848	850