From 92be86915a1ff207093eff42222077d4771efb99 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Wed, 15 Dec 2010 07:30:49 -0800 Subject: [PATCH] --- yaml --- r: 225329 b: refs/heads/master c: 895ad7eb21ed228444169dbbff44f3dccfc7e006 h: refs/heads/master i: 225327: 49861160ae2d374b658bdb0e1b3b26c3c9204694 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 5 ----- trunk/drivers/net/wireless/ath/ath9k/hw.h | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fdabee6acd61..49d03672cf1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8a8440e3f1f0cdd23074c6d2d8cbbde204a4374 +refs/heads/master: 895ad7eb21ed228444169dbbff44f3dccfc7e006 diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c index 69f779237d28..4c744793b4b6 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +++ b/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c @@ -50,11 +50,6 @@ static int ar9003_get_training_power_2g(struct ath_hw *ah) return power; } -static int get_streams(int mask) -{ - return !!(mask & BIT(0)) + !!(mask & BIT(1)) + !!(mask & BIT(2)); -} - static int ar9003_get_training_power_5g(struct ath_hw *ah) { struct ath_common *common = ath9k_hw_common(ah); diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.h b/trunk/drivers/net/wireless/ath/ath9k/hw.h index 97f22c428603..fb64ab841dc1 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/hw.h +++ b/trunk/drivers/net/wireless/ath/ath9k/hw.h @@ -868,6 +868,11 @@ static inline struct ath_hw_ops *ath9k_hw_ops(struct ath_hw *ah) return &ah->ops; } +static inline u8 get_streams(int mask) +{ + return !!(mask & BIT(0)) + !!(mask & BIT(1)) + !!(mask & BIT(2)); +} + /* Initialization, Detach, Reset */ const char *ath9k_hw_probe(u16 vendorid, u16 devid); void ath9k_hw_deinit(struct ath_hw *ah);