From 1f6a72e53c6d4a53433abbff24354c1d9dd988ab Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Mon, 7 Feb 2011 13:44:34 -0800
Subject: [PATCH] --- yaml --- r: 237355 b: refs/heads/master c:
 4d51e149a6231ea9cc210795cbc358a7c9a8e016 h: refs/heads/master i:   237353:
 b36bb1d27980b30cdf5ebafa293f7a6553a82cc9   237351:
 021fbd0b0ce51e5e776beb30b5fb891e661151a4 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/cfg.c  | 1 +
 trunk/net/mac80211/mlme.c | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0ea2383f142d..f2b3cb93c490 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c79a61095936f81cb05e99062185cb987d524ab
+refs/heads/master: 4d51e149a6231ea9cc210795cbc358a7c9a8e016
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 845c76d58d25..f7a1f08ec3e0 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1862,6 +1862,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
 
 	wk->type = IEEE80211_WORK_OFFCHANNEL_TX;
 	wk->chan = chan;
+	wk->chan_type = channel_type;
 	wk->sdata = sdata;
 	wk->done = ieee80211_offchan_tx_done;
 	wk->offchan_tx.frame = skb;
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index f77adf1a520e..d89e87866e51 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2294,6 +2294,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
 	else
 		wk->type = IEEE80211_WORK_DIRECT_PROBE;
 	wk->chan = req->bss->channel;
+	wk->chan_type = NL80211_CHAN_NO_HT;
 	wk->sdata = sdata;
 	wk->done = ieee80211_probe_auth_done;
 
@@ -2443,6 +2444,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
 		memcpy(wk->assoc.prev_bssid, req->prev_bssid, ETH_ALEN);
 
 	wk->chan = req->bss->channel;
+	wk->chan_type = NL80211_CHAN_NO_HT;
 	wk->sdata = sdata;
 	wk->done = ieee80211_assoc_done;
 	if (!bss->dtim_period &&