mac80211: update the channel context after channel switch

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>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 5d6dae9e4aac099379e6ad8ed54d5ef40eac0f88..da1c12c34487e31b8d183ab70b856c5f3f4466bb 100644 (file)
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -1011,6 +1011,10 @@ ieee80211_vif_use_reserved_reassign(struct ieee80211_sub_if_data *sdata)
 
        ieee80211_vif_update_chandef(sdata, &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);