From: Ivo van Doorn <ivdoorn@gmail.com>
Date: Sat, 2 Feb 2008 22:53:10 +0000 (+0100)
Subject: wireless: Fix WARN_ON() with ieee802.11b
X-Git-Tag: v2.6.26-rc1~1138^2~530^2~109
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=406f2388cc1f6e6c176305bd325cef230ce1afdd;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/net/wireless/util.c b/net/wireless/util.c
index e6046901055..77336c22fcf 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);