From: Felix Fietkau <nbd@openwrt.org>
To: Helmut Schaa <helmut.schaa@googlemail.com>
Cc: John Linville <linville@tuxdriver.com>,
linux-wireless@vger.kernel.org,
Johannes Berg <johannes@sipsolutions.net>
Subject: Re: [PATCHv2 2/2] mac80211: Don't use EAPOL frames for rate sampling
Date: Mon, 01 Aug 2011 11:38:58 +0200 [thread overview]
Message-ID: <4E367432.60601@openwrt.org> (raw)
In-Reply-To: <1312191173-23963-2-git-send-email-helmut.schaa@googlemail.com>
On 2011-08-01 11:32 AM, Helmut Schaa wrote:
> Signed-off-by: Helmut Schaa<helmut.schaa@googlemail.com>
> ---
>
> Haven't done much testing yet but this looks safe to me.
> Helmut
>
> net/mac80211/rc80211_minstrel_ht.c | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
> index 66a1eeb..2158838 100644
> --- a/net/mac80211/rc80211_minstrel_ht.c
> +++ b/net/mac80211/rc80211_minstrel_ht.c
> @@ -608,7 +608,13 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
> return mac80211_minstrel.get_rate(priv, sta,&msp->legacy, txrc);
>
> info->flags |= mi->tx_flags;
> - sample_idx = minstrel_get_sample_rate(mp, mi);
> +
> + /* Don't use EAPOL frames for sampling on non-mrr hw */
> + if (mp->hw->max_rates == 1&&
> + txrc->skb->protocol == cpu_to_be16(ETH_P_PAE))
I think checking for mp->hw->max_rates < 3 would be better here, because
then it also covers the primary rate + fallback rate case (as being used
by b43), which also doesn't include the max_prob_rate in the mrr series.
- Felix
next prev parent reply other threads:[~2011-08-01 9:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-01 9:32 [PATCHv2 1/2] mac80211: Fill in skb->protocol information for injected frames Helmut Schaa
2011-08-01 9:32 ` [PATCHv2 2/2] mac80211: Don't use EAPOL frames for rate sampling Helmut Schaa
2011-08-01 9:38 ` Felix Fietkau [this message]
2011-08-01 9:43 ` Helmut Schaa
2011-08-01 9:53 ` Felix Fietkau
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=4E367432.60601@openwrt.org \
--to=nbd@openwrt.org \
--cc=helmut.schaa@googlemail.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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).