diff options
| author | Luciano Coelho <luciano.coelho@intel.com> | 2014-11-07 15:28:33 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-10 10:17:42 +0100 |
| commit | 000baa5dfd99abe8a6e4ddbe900be5a570a1e20c (patch) | |
| tree | 82e1a34d7f8c71bdd771c9f234d32f84d4238938 /net | |
| parent | 1ef4c850491e6598f81f578f62697f9c9c2facca (diff) | |
| download | linux-000baa5dfd99abe8a6e4ddbe900be5a570a1e20c.tar.gz linux-000baa5dfd99abe8a6e4ddbe900be5a570a1e20c.tar.bz2 linux-000baa5dfd99abe8a6e4ddbe900be5a570a1e20c.zip | |
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: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/cfg.c | 12 |
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, 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); |