mac80211: brcmfmac: backport patches that were skipped previously #2
[15.05/openwrt.git] / package / kernel / mac80211 / patches / 351-0027-brcmfmac-restore-stopping-netdev-queue-when-bus-clog.patch
1 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
2 Date: Fri, 15 Jul 2016 12:16:12 +0200
3 Subject: [PATCH] brcmfmac: restore stopping netdev queue when bus clogs up
4 MIME-Version: 1.0
5 Content-Type: text/plain; charset=UTF-8
6 Content-Transfer-Encoding: 8bit
7
8 When the host-interface bus has hard time handling transmit packets
9 it informs higher layer about this and it would stop the netdev
10 queue when needed. However, since commit 9cd18359d31e ("brcmfmac:
11 Make FWS queueing configurable.") this was broken. With this patch
12 the behaviour is restored.
13
14 Cc: stable@vger.kernel.org # v4.5, v4.6, v4.7
15 Fixes: 9cd18359d31e ("brcmfmac: Make FWS queueing configurable.")
16 Tested-by: Per Förlin <per.forlin@gmail.com>
17 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
18 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
19 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
20 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
21 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
22 ---
23
24 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
25 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
26 @@ -2469,10 +2469,22 @@ void brcmf_fws_bustxfail(struct brcmf_fw
27  void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked)
28  {
29         struct brcmf_fws_info *fws = drvr->fws;
30 +       struct brcmf_if *ifp;
31 +       int i;
32  
33 -       fws->bus_flow_blocked = flow_blocked;
34 -       if (!flow_blocked)
35 -               brcmf_fws_schedule_deq(fws);
36 -       else
37 -               fws->stats.bus_flow_block++;
38 +       if (fws->avoid_queueing) {
39 +               for (i = 0; i < BRCMF_MAX_IFS; i++) {
40 +                       ifp = drvr->iflist[i];
41 +                       if (!ifp || !ifp->ndev)
42 +                               continue;
43 +                       brcmf_txflowblock_if(ifp, BRCMF_NETIF_STOP_REASON_FLOW,
44 +                                            flow_blocked);
45 +               }
46 +       } else {
47 +               fws->bus_flow_blocked = flow_blocked;
48 +               if (!flow_blocked)
49 +                       brcmf_fws_schedule_deq(fws);
50 +               else
51 +                       fws->stats.bus_flow_block++;
52 +       }
53  }