| Message ID | 1417095717-23017-1-git-send-email-emmanuel.grumbach@intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, 2014-11-27 at 15:41 +0200, Emmanuel Grumbach wrote: > When the channel switch has been made, a vif is now using > the channel context which was reserved. When that happens, > we need to update the channel context since its parameters > may change. > > I hit a case in which I switched to a 40Mhz channel but the > reserved channel context was still on 20Mhz. The rate control > would try to send 40Mhz packets on a 20Mhz channel context and > that made iwlwifi's firmware unhappy. > > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> > --- > This is a second version of the patch I sent earlier. > I think the first version is more generic. I prefer this version 1) if there really is a chanctx that can be in use and reserved at the same time, it seems strange to mix the two concepts for the actual operation of the chanctx 2) semantically, the reservation is so that nothing can steal the chanctx, we don't really care much about the contents until we need it. Please resend with [PATCH] and I'll merge it. 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 4c74e8d..eadc1a0 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -993,6 +993,10 @@ ieee80211_vif_use_reserved_reassign(struct ieee80211_sub_if_data *sdata) sdata->vif.bss_conf.chandef = sdata->reserved_chandef; + ieee80211_recalc_smps_chanctx(local, new_ctx); + ieee80211_recalc_radar_chanctx(local, new_ctx); + ieee80211_recalc_chanctx_min_def(local, new_ctx); + if (changed) ieee80211_bss_info_change_notify(sdata, changed);
When the channel switch has been made, a vif is now using the channel context which was reserved. When that happens, we need to update the channel context since its parameters may change. I hit a case in which I switched to a 40Mhz channel but the reserved channel context was still on 20Mhz. The rate control would try to send 40Mhz packets on a 20Mhz channel context and that made iwlwifi's firmware unhappy. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> --- This is a second version of the patch I sent earlier. I think the first version is more generic. Luca / Michal / Whoever, please share your thoughts on which version should be merged. --- net/mac80211/chan.c | 4 ++++ 1 file changed, 4 insertions(+)