aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2011-02-03 22:22:55 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 15:14:31 -0800
commit653779ea4311a543968c3f042139c2cac3903310 (patch)
treead0d716bdd119248eaea52bd54ef521554877a11
parente3c1891dca97133a92658b0b03327ed706862a98 (diff)
downloadlinux-hpc-653779ea4311a543968c3f042139c2cac3903310.tar.gz
carl9170: fix typo in PS code
commit 5820de5303f73d48dcc3a053c875d1f0da7eef67 upstream. This patch fixes a off-by-one bug which bugged the driver's PS-POLL capability. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/wireless/ath/carl9170/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index 939a0e96ed1f51..84866a4b83509a 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -564,7 +564,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len)
cam = ieee80211_check_tim(tim_ie, tim_len, ar->common.curaid);
/* 2. Maybe the AP wants to send multicast/broadcast data? */
- cam = !!(tim_ie->bitmap_ctrl & 0x01);
+ cam |= !!(tim_ie->bitmap_ctrl & 0x01);
if (!cam) {
/* back to low-power land. */