The compile_ffsx macros were missing a set of parentheses, which resulted in
wrong bit offset calculations.
This fixes rt61pci detection failures, whereby the rf chipset wasn't detected
properly due to improper bit shifting.
This patch is based on GertJan's report + patch to fix the parentheses problem
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
---
drivers/net/wireless/rt2x00/rt2x00reg.h | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h
index 03e846f..7999d54 100644
--- a/drivers/net/wireless/rt2x00/rt2x00reg.h
+++ b/drivers/net/wireless/rt2x00/rt2x00reg.h
@@ -145,19 +145,23 @@ struct rt2x00_field32 {
* compile-time rather then run-time.
*/
#define compile_ffs2(__x) \
- ((__x) & 0x1) ? 0 : 1
+ ( ((__x) & 0x1) ? 0 : 1 )
#define compile_ffs4(__x) \
- ((__x) & 0x3) ? compile_ffs2(__x) : compile_ffs2(__x >> 2) + 2
+ ( ((__x) & 0x3) ? \
+ compile_ffs2(__x) : (compile_ffs2(__x >> 2) + 2) )
#define compile_ffs8(__x) \
- ((__x) & 0xf) ? compile_ffs4(__x) : compile_ffs4(__x >> 4) + 4
+ ( ((__x) & 0xf) ? \
+ compile_ffs4(__x) : (compile_ffs4(__x >> 4) + 4) )
#define compile_ffs16(__x) \
- ((__x) & 0xff) ? compile_ffs8(__x) : compile_ffs8(__x >> 8) + 8
+ ( ((__x) & 0xff) ? \
+ compile_ffs8(__x) : (compile_ffs8(__x >> 8) + 8) )
#define compile_ffs32(__x) \
- ((__x) & 0xffff) ? compile_ffs16(__x) : compile_ffs16(__x >> 16) + 16
+ ( ((__x) & 0xffff) ? \
+ compile_ffs16(__x) : (compile_ffs16(__x >> 16) + 16) )
/*
* This macro will check the requirements for the FIELD{8,16,32} macros
--
1.5.5.3
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
