diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-08 12:03:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-08 12:03:54 -0800 |
| commit | e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 (patch) | |
| tree | a0261a4fae2b2e288cbc7e14a8f1acd47d4f2df4 /drivers/net/wireless/ath/carl9170/rx.c | |
| parent | 429a01a70f301baf0c8fc780f891a18c296d5e24 (diff) | |
| parent | fc7c976dc7a565213393ce700d4a6105f037bf20 (diff) | |
| download | blackbird-op-linux-e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0.tar.gz blackbird-op-linux-e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/rx.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/rx.c | 2 |
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. */ |
