---

yaml --- r: 233069 b: refs/heads/master c: 5820de5 h: refs/heads/master i: 233067: 4b22a69 v: v3
git-mirror · Feb 4, 2011 · f6a4293 · f6a4293
1 parent f8a2cc3
commit f6a4293
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d048aac990d587c81fc1002e28502e6f95371ee
+refs/heads/master: 5820de5303f73d48dcc3a053c875d1f0da7eef67
diff --git a/trunk/drivers/net/wireless/ath/carl9170/rx.c b/trunk/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. */