aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/cfg.c1
-rw-r--r--net/mac80211/mlme.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 845c76d58d2..f7a1f08ec3e 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1862,6 +1862,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
1862 1862
1863 wk->type = IEEE80211_WORK_OFFCHANNEL_TX; 1863 wk->type = IEEE80211_WORK_OFFCHANNEL_TX;
1864 wk->chan = chan; 1864 wk->chan = chan;
1865 wk->chan_type = channel_type;
1865 wk->sdata = sdata; 1866 wk->sdata = sdata;
1866 wk->done = ieee80211_offchan_tx_done; 1867 wk->done = ieee80211_offchan_tx_done;
1867 wk->offchan_tx.frame = skb; 1868 wk->offchan_tx.frame = skb;
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f77adf1a520..d89e87866e5 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2294,6 +2294,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
2294 else 2294 else
2295 wk->type = IEEE80211_WORK_DIRECT_PROBE; 2295 wk->type = IEEE80211_WORK_DIRECT_PROBE;
2296 wk->chan = req->bss->channel; 2296 wk->chan = req->bss->channel;
2297 wk->chan_type = NL80211_CHAN_NO_HT;
2297 wk->sdata = sdata; 2298 wk->sdata = sdata;
2298 wk->done = ieee80211_probe_auth_done; 2299 wk->done = ieee80211_probe_auth_done;
2299 2300
@@ -2443,6 +2444,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
2443 memcpy(wk->assoc.prev_bssid, req->prev_bssid, ETH_ALEN); 2444 memcpy(wk->assoc.prev_bssid, req->prev_bssid, ETH_ALEN);
2444 2445
2445 wk->chan = req->bss->channel; 2446 wk->chan = req->bss->channel;
2447 wk->chan_type = NL80211_CHAN_NO_HT;
2446 wk->sdata = sdata; 2448 wk->sdata = sdata;
2447 wk->done = ieee80211_assoc_done; 2449 wk->done = ieee80211_assoc_done;
2448 if (!bss->dtim_period && 2450 if (!bss->dtim_period &&