From: Ben Greear Date: Mon, 7 Feb 2011 21:44:34 +0000 (-0800) Subject: mac80211: Properly set work-item channel-type. X-Git-Tag: v2.6.39-rc1~468^2~25^2^2~213 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d51e149a6231ea9cc210795cbc358a7c9a8e016;p=platform%2Fkernel%2Flinux-stable.git mac80211: Properly set work-item channel-type. Some were indirectly set to NO_HT (zero), but I think it's better to explicitly set it in case the enum ever changes. In cfg.c, it seems the channel-type was just ignored (and thus always set to NO_HT). Signed-off-by: Ben Greear Signed-off-by: John W. Linville --- diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 845c76d..f7a1f08 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, 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/net/mac80211/mlme.c b/net/mac80211/mlme.c index f77adf1..d89e878 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, 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 &&