Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 000baa5d authored by Luciano Coelho's avatar Luciano Coelho Committed by Johannes Berg
Browse files

mac80211: fix order of setting ch_switch and drv_pre_channel_switch call 



There was a mistake when merging commit 6d027bcc (mac80211: add
pre_channel_switch driver operation) for upstream.  The assignment of
the values in the ch_switch structure came below the call to
drv_pre_channel_switch.  Fix the order.

Fixes: 6d027bcc (mac80211: add pre_channel_switch driver operation)
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1ef4c850

net/mac80211/cfg.c

+6 −6
Original line number Diff line number Diff line
@@ -3158,6 +3158,12 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, 
		goto out;

	}



	ch_switch.timestamp = 0;

	ch_switch.device_timestamp = 0;

	ch_switch.block_tx = params->block_tx;

	ch_switch.chandef = params->chandef;

	ch_switch.count = params->count;



	err = drv_pre_channel_switch(sdata, &ch_switch);

	if (err)

		goto out;
@@ -3175,12 +3181,6 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, 
		goto out;

	}



	ch_switch.timestamp = 0;

	ch_switch.device_timestamp = 0;

	ch_switch.block_tx = params->block_tx;

	ch_switch.chandef = params->chandef;

	ch_switch.count = params->count;



	err = ieee80211_set_csa_beacon(sdata, params, &changed);

	if (err) {

		ieee80211_vif_unreserve_chanctx(sdata);