aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/cfg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 06185940cbb6..76e794edd960 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3158,6 +3158,12 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
3158 goto out; 3158 goto out;
3159 } 3159 }
3160 3160
3161 ch_switch.timestamp = 0;
3162 ch_switch.device_timestamp = 0;
3163 ch_switch.block_tx = params->block_tx;
3164 ch_switch.chandef = params->chandef;
3165 ch_switch.count = params->count;
3166
3161 err = drv_pre_channel_switch(sdata, &ch_switch); 3167 err = drv_pre_channel_switch(sdata, &ch_switch);
3162 if (err) 3168 if (err)
3163 goto out; 3169 goto out;
@@ -3175,12 +3181,6 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
3175 goto out; 3181 goto out;
3176 } 3182 }
3177 3183
3178 ch_switch.timestamp = 0;
3179 ch_switch.device_timestamp = 0;
3180 ch_switch.block_tx = params->block_tx;
3181 ch_switch.chandef = params->chandef;
3182 ch_switch.count = params->count;
3183
3184 err = ieee80211_set_csa_beacon(sdata, params, &changed); 3184 err = ieee80211_set_csa_beacon(sdata, params, &changed);
3185 if (err) { 3185 if (err) {
3186 ieee80211_vif_unreserve_chanctx(sdata); 3186 ieee80211_vif_unreserve_chanctx(sdata);