From 7ae2b0cf74feb28b7b62d2d55cbcb59b8a35ed73 Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Mon, 1 Sep 2008 14:47:19 +0300 Subject: [PATCH] --- yaml --- r: 109439 b: refs/heads/master c: 445df54fec7c1924f44018c4db2a9613b877f10e h: refs/heads/master i: 109437: ac63f86aee28eea7bfed6ab45712ab6bb9158d9e 109435: 79c2e65c3181fef02fc4752749f577366e31c6a8 109431: 22de7e164b4ec7ffcca23d356ec96546a3a01d18 109423: df45b1343c0e85b566e674a8976eb2969256700f 109407: edd50a9cb9d403e437850d67b6a2794e8eba083c 109375: ceef95a4db05ac178a8190c0330980bad1bbd860 109311: ab708d25d10113febfca1932109e3df6c63a556a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00reg.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a617bcd9974a..3df91f901135 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b58b209399844995ad48e421267e359e16c03db +refs/heads/master: 445df54fec7c1924f44018c4db2a9613b877f10e diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00reg.h b/trunk/drivers/net/wireless/rt2x00/rt2x00reg.h index 7e88ce5651b9..2ea7866abd5d 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00reg.h +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00reg.h @@ -136,7 +136,7 @@ struct rt2x00_field32 { */ #define is_power_of_two(x) ( !((x) & ((x)-1)) ) #define low_bit_mask(x) ( ((x)-1) & ~(x) ) -#define is_valid_mask(x) is_power_of_two(1 + (x) + low_bit_mask(x)) +#define is_valid_mask(x) is_power_of_two(1LU + (x) + low_bit_mask(x)) /* * Macro's to find first set bit in a variable. @@ -173,8 +173,7 @@ struct rt2x00_field32 { * does not exceed the given typelimit. */ #define FIELD_CHECK(__mask, __type) \ - BUILD_BUG_ON(!__builtin_constant_p(__mask) || \ - !(__mask) || \ + BUILD_BUG_ON(!(__mask) || \ !is_valid_mask(__mask) || \ (__mask) != (__type)(__mask)) \