Message ID | 1417360646-5262-1-git-send-email-emmanuel.grumbach@intel.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Sun, 2014-11-30 at 17:17 +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. Applied. 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 c7c5142..bde457d 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -996,6 +996,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> --- net/mac80211/chan.c | 4 ++++ 1 file changed, 4 insertions(+)