git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pending-l2x0' into cache
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
airo.c
diff --git
a/drivers/net/wireless/airo.c
b/drivers/net/wireless/airo.c
index
4eec87c
..
4331d67
100644
(file)
--- a/
drivers/net/wireless/airo.c
+++ b/
drivers/net/wireless/airo.c
@@
-4806,7
+4806,7
@@
static int airo_config_commit(struct net_device *dev,
static inline int sniffing_mode(struct airo_info *ai)
{
- return
le16_to_cpu(ai->config.rmode & RXMODE_MASK
) >=
+ return
(le16_to_cpu(ai->config.rmode) & le16_to_cpu(RXMODE_MASK)
) >=
le16_to_cpu(RXMODE_RFMON);
}