[PATCH] mac80211: reconfigure channel contexts on ieee80211_reconfigure

[PATCH] mac80211: reconfigure channel contexts on ieee80211_reconfigure

[Eliad Peller]

The channel contexts have to be re-added and re-assigned
on device reconfiguration.

Signed-off-by: Eliad Peller <eliad@wizery.com>
---
this patch is based on the channel contexts patches
in mac80211-next/wip branch.

net/mac80211/util.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 293e6fe..c254abc 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1255,6 +1255,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 {
 	struct ieee80211_hw *hw = &local->hw;
 	struct ieee80211_sub_if_data *sdata;
+	struct ieee80211_chanctx *ctx;
 	struct sta_info *sta;
 	int res, i;
 
@@ -1327,6 +1328,12 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 			res = drv_add_interface(local, sdata);
 	}
 
+	/* add channel contexts */
+	mutex_lock(&local->chanctx_mtx);
+	list_for_each_entry(ctx, &local->chanctx_list, list)
+		WARN_ON(drv_add_chanctx(local, ctx));
+	mutex_unlock(&local->chanctx_mtx);
+
 	/* add STAs back */
 	mutex_lock(&local->sta_mtx);
 	list_for_each_entry(sta, &local->sta_list, list) {
@@ -1367,11 +1374,22 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 
 	/* Finally also reconfigure all the BSS information */
 	list_for_each_entry(sdata, &local->interfaces, list) {
+		struct ieee80211_chanctx_conf *ctx_conf;
 		u32 changed;
 
 		if (!ieee80211_sdata_running(sdata))
 			continue;
 
+		mutex_lock(&local->chanctx_mtx);
+		ctx_conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
+				lockdep_is_held(&local->chanctx_mtx));
+		if (ctx_conf) {
+			ctx = container_of(ctx_conf, struct ieee80211_chanctx,
+					   conf);
+			drv_assign_vif_chanctx(local, sdata, ctx);
+		}
+		mutex_unlock(&local->chanctx_mtx);
+
 		/* common change flags for all interface types */
 		changed = BSS_CHANGED_ERP_CTS_PROT |
 			  BSS_CHANGED_ERP_PREAMBLE |
-- 
1.7.6.401.g6a319

Re: [PATCH] mac80211: reconfigure channel contexts on ieee80211_reconfigure

[Johannes Berg]

On Mon, 2012-08-06 at 16:52 +0300, Eliad Peller wrote:
> The channel contexts have to be re-added and re-assigned
> on device reconfiguration.

Thanks. I've applied it to the wip branch, but will probably just merge
it into the correct patch later.

johannes