The following commit has been merged in the linux branch: commit 9e7ba2465fd453429aa5849c2aadb526cda19034 Author: Roel Kluin roel.kluin@gmail.com Date: Tue Oct 6 14:33:14 2009 +0200

mac80211: fix ADM8211_SYNCTL_RFtype define

A logical of shifts to the left doesn't make sense.

Signed-off-by: Roel Kluin roel.kluin@gmail.com Signed-off-by: John W. Linville linville@tuxdriver.com

diff --git a/drivers/net/wireless/adm8211.h b/drivers/net/wireless/adm8211.h index 4f6ab13..b07e4d3 100644 --- a/drivers/net/wireless/adm8211.h +++ b/drivers/net/wireless/adm8211.h @@ -266,7 +266,7 @@ do { \ #define ADM8211_SYNCTL_CS1 (1 << 28) #define ADM8211_SYNCTL_CAL (1 << 27) #define ADM8211_SYNCTL_SELCAL (1 << 26) -#define ADM8211_SYNCTL_RFtype ((1 << 24) || (1 << 23) || (1 << 22)) +#define ADM8211_SYNCTL_RFtype ((1 << 24) | (1 << 23) | (1 << 22)) #define ADM8211_SYNCTL_RFMD (1 << 22) #define ADM8211_SYNCTL_GENERAL (0x7 << 22) /* SYNCTL 21:0 Data (Si4126: 18-bit data, 4-bit address) */