aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2013-04-17 15:25:49 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-04-22 15:20:20 -0400
commit07529d20471b07fb8756fd4b9e9ddb8b270808e4 (patch)
tree3b4e51574bd5ff1b4e418085b8fbe0f80cfe113e
parent557985ae3442b43a776e58a494e1b6f549321ce2 (diff)
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>
-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)
1070 int num_nodes; 1070 int num_nodes;
1071 int node_pos; 1071 int node_pos;
1072 int prec_out; 1072 int prec_out;
1073 int pmsk = 3; 1073 int pmsk;
1074 int i; 1074 int i;
1075 1075
1076 table = (struct brcmf_fws_mac_descriptor *)&fws->desc; 1076 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)
1084 1084
1085 if (entry->suppressed) 1085 if (entry->suppressed)
1086 pmsk = 2; 1086 pmsk = 2;
1087 else
1088 pmsk = 3;
1087 p = brcmu_pktq_mdeq(&entry->psq, pmsk << (fifo * 2), &prec_out); 1089 p = brcmu_pktq_mdeq(&entry->psq, pmsk << (fifo * 2), &prec_out);
1088 if (p == NULL) { 1090 if (p == NULL) {
1089 if (entry->suppressed) { 1091 if (entry->suppressed) {