]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
mac80211: fix ecw2cw brain-damage
authorJohannes Berg <johannes@sipsolutions.net>
Wed, 13 Feb 2008 23:30:35 +0000 (00:30 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Feb 2008 20:37:10 +0000 (15:37 -0500)
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>
net/mac80211/ieee80211_sta.c

index 11f2ee6b2269f1ac22c34600e82b5277edf2bea8..a465e38c72529e778728542afdc7caac9cde0282 100644 (file)
@@ -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,