2009-01-13 12:33:54

by Jouni Malinen

[permalink] [raw]
Subject: [PATCH] ath9k: Fix an operator typo in phy rate validation

This was not supposed to be a bitwise AND operation, but a check of
two separate conditions. Anyway, the old code happened to result in
the same behavior, so this is just changing the code to be easier to
understand and also to keep sparse from warning about dubious
operators.

Signed-off-by: Jouni Malinen <[email protected]>

---
drivers/net/wireless/ath9k/rc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- wireless-testing.orig/drivers/net/wireless/ath9k/rc.c 2009-01-13 14:11:26.000000000 +0200
+++ wireless-testing/drivers/net/wireless/ath9k/rc.c 2009-01-13 14:11:37.000000000 +0200
@@ -490,7 +490,7 @@ static inline int ath_rc_get_nextvalid_t

static int ath_rc_valid_phyrate(u32 phy, u32 capflag, int ignore_cw)
{
- if (WLAN_RC_PHY_HT(phy) & !(capflag & WLAN_RC_HT_FLAG))
+ if (WLAN_RC_PHY_HT(phy) && !(capflag & WLAN_RC_HT_FLAG))
return 0;
if (WLAN_RC_PHY_DS(phy) && !(capflag & WLAN_RC_DS_FLAG))
return 0;

--
Jouni Malinen PGP id EFC895FA