mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From a17b92baec44ce27ca9df9e13d2a33707011474c Mon Sep 17 00:00:00 2001
|
|
From: Wright Feng <wright.feng@cypress.com>
|
|
Date: Wed, 26 Aug 2020 02:06:19 -0500
|
|
Subject: [PATCH 061/179] revert: brcmfmac: set state of hanger slot to FREE
|
|
when flushing PSQ
|
|
|
|
Revert this change because it is conflict with upstream
|
|
commit c80d26e81ef1 ("brcmfmac: fix WARNING during USB disconnect in
|
|
case of unempty psq")
|
|
|
|
Signed-off-by: Wright Feng <wright.feng@cypress.com>
|
|
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
|
|
index 8723ecfb810a..8d41be637760 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
|
|
@@ -624,7 +624,6 @@ static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h,
|
|
static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q,
|
|
int ifidx)
|
|
{
|
|
- struct brcmf_fws_hanger_item *hi;
|
|
bool (*matchfn)(struct sk_buff *, void *) = NULL;
|
|
struct sk_buff *skb;
|
|
int prec;
|
|
@@ -636,8 +635,6 @@ static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q,
|
|
skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &ifidx);
|
|
while (skb) {
|
|
hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT);
|
|
- hi = &fws->hanger.items[hslot];
|
|
- WARN_ON(skb != hi->pkt);
|
|
brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb,
|
|
true);
|
|
brcmu_pkt_buf_free_skb(skb);
|
|
--
|
|
2.17.1
|
|
|