Linux wireless drivers development
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>
Subject: [PATCH for 2.6.28] mac80211: fix basic rates
Date: Wed, 29 Oct 2008 18:14:06 +0100	[thread overview]
Message-ID: <1225300446.5439.27.camel@johannes.berg> (raw)

This fixes the basic rate bitmap calculation in mac80211.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: stable@kernel.org [2.6.25, 2.6.26, 2.6.27]
---
Is this appropriate for stable? It's a trivial and obvious fix, and can
throw off the duration calculation, but it's likely nobody will ever
really notice...

 net/mac80211/mlme.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- everything.orig/net/mac80211/mlme.c	2008-10-29 18:08:12.000000000 +0100
+++ everything/net/mac80211/mlme.c	2008-10-29 18:08:19.000000000 +0100
@@ -1307,8 +1307,9 @@ static void ieee80211_rx_mgmt_assoc_resp
 			have_higher_than_11mbit = true;
 
 		for (j = 0; j < sband->n_bitrates; j++) {
-			if (sband->bitrates[j].bitrate == rate)
-				rates |= BIT(j);
+			if (sband->bitrates[j].bitrate != rate)
+				continue;
+			rates |= BIT(j);
 			if (elems.supp_rates[i] & 0x80)
 				basic_rates |= BIT(j);
 		}
@@ -1321,8 +1322,9 @@ static void ieee80211_rx_mgmt_assoc_resp
 			have_higher_than_11mbit = true;
 
 		for (j = 0; j < sband->n_bitrates; j++) {
-			if (sband->bitrates[j].bitrate == rate)
-				rates |= BIT(j);
+			if (sband->bitrates[j].bitrate != rate)
+				continue;
+			rates |= BIT(j);
 			if (elems.ext_supp_rates[i] & 0x80)
 				basic_rates |= BIT(j);
 		}



             reply	other threads:[~2008-10-30 10:12 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-29 17:14 Johannes Berg [this message]
2008-10-30 13:23 ` [PATCH for 2.6.28] mac80211: fix basic rates Tomas Winkler
2008-10-30 14:24   ` Johannes Berg
2008-10-30 14:39     ` Tomas Winkler
2008-10-30 14:41       ` Johannes Berg
2008-10-30 14:51         ` Tomas Winkler
2008-10-30 14:54           ` 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=1225300446.5439.27.camel@johannes.berg \
    --to=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