From: Johannes Berg <johannes@sipsolutions.net>
To: greearb@candelatech.com
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH 3/7] mac80211: Properly set work-item channel-type.
Date: Mon, 14 Feb 2011 11:21:57 +0100 [thread overview]
Message-ID: <1297678917.3785.22.camel@jlt3.sipsolutions.net> (raw)
In-Reply-To: <1297115078-27773-3-git-send-email-greearb@candelatech.com>
On Mon, 2011-02-07 at 13:44 -0800, greearb@candelatech.com wrote:
> From: Ben Greear <greearb@candelatech.com>
>
> 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@sipsolutions.net>
> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---
> :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 &&
next prev parent reply other threads:[~2011-02-14 10:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-07 21:44 [PATCH 1/7] mac80211: Make STA disconnect messages warn instead of debug greearb
2011-02-07 21:44 ` [PATCH 2/7] ath9k: Print channel-type in chan-change dbg message greearb
2011-02-07 21:44 ` [PATCH 3/7] mac80211: Properly set work-item channel-type greearb
2011-02-14 10:21 ` Johannes Berg [this message]
2011-02-07 21:44 ` [PATCH 4/7] mac80211: Allow scanning on existing channel-type greearb
2011-02-07 21:44 ` [PATCH 5/7] mac80211: Allow work items to use existing channel type greearb
2011-02-07 21:44 ` [PATCH 6/7] ath9k: Add debug info for configuring power level greearb
2011-02-07 21:44 ` [PATCH 7/7] mac80211: Ensure power-level set properly for scanning greearb
2011-02-08 14:04 ` [PATCH 1/7] mac80211: Make STA disconnect messages warn instead of debug Kalle Valo
2011-02-08 17:10 ` Ben Greear
2011-02-09 12:07 ` Kalle Valo
2011-02-09 14:26 ` Ben Greear
2011-02-14 10:21 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297678917.3785.22.camel@jlt3.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=greearb@candelatech.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).