aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-02-02 23:53:10 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:19:33 -0500
commit406f2388cc1f6e6c176305bd325cef230ce1afdd (patch)
tree39b877344339b668ac19cbf4896e59fe978ca1a8 /net/wireless
parentiwlwifi: set rate_idx correctly from plcp (diff)
downloadlinux-dev-406f2388cc1f6e6c176305bd325cef230ce1afdd.tar.xz
linux-dev-406f2388cc1f6e6c176305bd325cef230ce1afdd.zip
wireless: Fix WARN_ON() with ieee802.11b
When the driver registers a IEEE80211_BAND_2GHZ band, it can either be 802.11b or 802.11g. But when 802.11b rates are registered "want" will be 3 (since 4 rates are being registered, and each of those 4 rates will decrease "want"). Since this is a correct situation, there is no need to trigger a WARN_ON() for this. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c
index e6046901055a..77336c22fcf2 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -80,7 +80,7 @@ static void set_mandatory_flags_band(struct ieee80211_supported_band *sband,
sband->bitrates[i].flags |=
IEEE80211_RATE_ERP_G;
}
- WARN_ON(want != 0 && want != 6);
+ WARN_ON(want != 0 && want != 3 && want != 6);
break;
case IEEE80211_NUM_BANDS:
WARN_ON(1);