aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-02-14 00:30:35 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:10 -0500
commitac2bf3242e1a329543be50b5c9df4f0119ee188c (patch)
treec1be7bd7ea7aa665fab71e5b6a9315064f0cfc0d
parent3e82a822c7c8ea5477062ec8885d7b90696fe73f (diff)
mac80211: fix ecw2cw brain-damage
This brain-damaged code just bothers me, fix it. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/ieee80211_sta.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 11f2ee6b226..a465e38c725 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -227,12 +227,7 @@ static void ieee802_11_parse_elems(u8 *start, size_t len,
static int ecw2cw(int ecw)
{
- int cw = 1;
- while (ecw > 0) {
- cw <<= 1;
- ecw--;
- }
- return cw - 1;
+ return (1 << ecw) - 1;
}
static void ieee80211_sta_wmm_params(struct net_device *dev,