On Mon, 2011-02-07 at 13:44 -0800, greearb@xxxxxxxxxxxxxxx wrote: > From: Ben Greear <greearb@xxxxxxxxxxxxxxx> > > 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). Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx> > --- > :100644 100644 a7cd6a1... 9938f7f... M net/mac80211/cfg.c > :100644 100644 340bef6... cd68f2a... M net/mac80211/mlme.c > net/mac80211/cfg.c | 1 + > net/mac80211/mlme.c | 2 ++ > 2 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c > index a7cd6a1..9938f7f 100644 > --- a/net/mac80211/cfg.c > +++ b/net/mac80211/cfg.c > @@ -1871,6 +1871,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 340bef6..cd68f2a 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 && -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
