From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 30 Jan 2008 16:36:10 +0000 (+0100)
Subject: wireless: fix ERP rate flags
X-Git-Tag: v2.6.26-rc1~1138^2~530^2~112
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aac09fbf827b467995b00a1ea0213843a9e605b8;p=linux-2.6-omap-h63xx.git

wireless: fix ERP rate flags

In the rate API patch I accidentally reverted the test for
ERP rates, this fixes it. All rates except 1, 2, 5.5 and 11
MBit are ERP rates, not those.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 0dcccbf3eb5..e6046901055 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -73,10 +73,10 @@ static void set_mandatory_flags_band(struct ieee80211_supported_band *sband,
 				want--;
 			}
 
-			if (sband->bitrates[i].bitrate == 10 ||
-			    sband->bitrates[i].bitrate == 20 ||
-			    sband->bitrates[i].bitrate == 55 ||
-			    sband->bitrates[i].bitrate == 110)
+			if (sband->bitrates[i].bitrate != 10 &&
+			    sband->bitrates[i].bitrate != 20 &&
+			    sband->bitrates[i].bitrate != 55 &&
+			    sband->bitrates[i].bitrate != 110)
 				sband->bitrates[i].flags |=
 					IEEE80211_RATE_ERP_G;
 		}