summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
diff options
context:
space:
mode:
authorArend van Spriel2013-04-17 21:25:49 +0200
committerJohn W. Linville2013-04-22 21:20:20 +0200
commit07529d20471b07fb8756fd4b9e9ddb8b270808e4 (patch)
tree3b4e51574bd5ff1b4e418085b8fbe0f80cfe113e /drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
parentrt2800: nulify all last words of TXWI (diff)
downloadkernel-qcow2-linux-07529d20471b07fb8756fd4b9e9ddb8b270808e4.tar.gz
kernel-qcow2-linux-07529d20471b07fb8756fd4b9e9ddb8b270808e4.tar.xz
kernel-qcow2-linux-07529d20471b07fb8756fd4b9e9ddb8b270808e4.zip
brcmfmac: reinitialize dequeue mask per node
The mask was only initialized for the first node, but it should be done for each node that is handled in the loop. Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index 1bcd58ce4a2f..9dae8fcea2c5 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -1070,7 +1070,7 @@ static struct sk_buff *brcmf_fws_deq(struct brcmf_fws_info *fws, int fifo)
int num_nodes;
int node_pos;
int prec_out;
- int pmsk = 3;
+ int pmsk;
int i;
table = (struct brcmf_fws_mac_descriptor *)&fws->desc;
@@ -1084,6 +1084,8 @@ static struct sk_buff *brcmf_fws_deq(struct brcmf_fws_info *fws, int fifo)
if (entry->suppressed)
pmsk = 2;
+ else
+ pmsk = 3;
p = brcmu_pktq_mdeq(&entry->psq, pmsk << (fifo * 2), &prec_out);
if (p == NULL) {
if (entry->suppressed) {