summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2011-02-03 22:22:55 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-02-04 22:11:39 +0100
commit5820de5303f73d48dcc3a053c875d1f0da7eef67 (patch)
treed98cdf123a1f7c18401d06de4c6a5c5c6c37432a
parentwireless, wl1251: Fix potential NULL pointer dereference in wl1251_op_bss_inf... (diff)
downloadlinux-5820de5303f73d48dcc3a053c875d1f0da7eef67.tar.xz
linux-5820de5303f73d48dcc3a053c875d1f0da7eef67.zip
carl9170: fix typo in PS code
This patch fixes a off-by-one bug which bugged the driver's PS-POLL capability. Cc: <stable@kernel.org> Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-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 939a0e96ed1f..84866a4b8350 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. */