Message ID | 1426143210-25635-5-git-send-email-emmanuel.grumbach@intel.com (mailing list archive) |
---|---|
State | Changes Requested |
Delegated to: | Johannes Berg |
Headers | show |
On Thu, 2015-03-12 at 08:53 +0200, Emmanuel Grumbach wrote: > From: Andrei Otcheretianski <andrei.otcheretianski@intel.com> > > It is possible to reserve a narrower channel context during csa (as long as > the chandefs are compatible). However when the reservation is used, the > channel context should be adjusted. Not doing so would result in attempts > to use higher rates than the chan_ctx supports. The commit log for this patch doesn't make any sense. I tried to make sense of it, even with Luca's help, but I can't - are you thinking about the min_def, which isn't really "the channel context" but just an auxiliary concept? I've applied all the other patches, but I rewrote the commit log for 7/7 (where I could figure out what you really meant) johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index ff0d2db..aef28fd 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -1008,6 +1008,8 @@ ieee80211_vif_use_reserved_reassign(struct ieee80211_sub_if_data *sdata) if (WARN_ON(!chandef)) return -EINVAL; + ieee80211_change_chanctx(local, new_ctx, chandef); + vif_chsw[0].vif = &sdata->vif; vif_chsw[0].old_ctx = &old_ctx->conf; vif_chsw[0].new_ctx = &new_ctx->conf; @@ -1079,6 +1081,8 @@ ieee80211_vif_use_reserved_assign(struct ieee80211_sub_if_data *sdata) if (WARN_ON(!chandef)) return -EINVAL; + ieee80211_change_chanctx(local, new_ctx, chandef); + list_del(&sdata->reserved_chanctx_list); sdata->reserved_chanctx = NULL;