From 43e148e40a770a4163fc2270c2ac1037db987d47 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 17 Apr 2013 21:25:49 +0200 Subject: [PATCH] --- yaml --- r: 369625 b: refs/heads/master c: 07529d20471b07fb8756fd4b9e9ddb8b270808e4 h: refs/heads/master i: 369623: 221273e05399f807bf4669573350753a6aa7cdad v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 92bc33faeeb2..6f14d2d88bcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 557985ae3442b43a776e58a494e1b6f549321ce2 +refs/heads/master: 07529d20471b07fb8756fd4b9e9ddb8b270808e4 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c index 1bcd58ce4a2f..9dae8fcea2c5 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +++ b/trunk/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) {