brcmfmac: .txdata() bus callback should not call brcmf_txcomplete()

With firmware-signalling the packet handed to the bus specific driver
layer should not be discarded with brcmf_txcomplete() in the failure
path. Instead only an error is returned and the caller decides what
to do with the packet.

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>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 5cbce1dff0931fe81e1ef54832c4de9d8d66be6a..db31312eba6a9f8916181b43e9bdf0bd6f2bdbc5 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -2297,7 +2297,6 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
        spin_lock_irqsave(&bus->txqlock, flags);
        if (!brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec)) {
                skb_pull(pkt, SDPCM_HDRLEN);
-               brcmf_txcomplete(bus->sdiodev->dev, pkt, false);
                brcmf_err("out of bus->txq !!!\n");
                ret = -ENOSR;
        } else {

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index 29b1f24c2d0f92c86a55dade5e0e61a943004608..601b0d05169cf2eacb7b0abe7a42251ee453965b 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -1745,6 +1745,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)
        int fifo = BRCMF_FWS_FIFO_BCMC;
        bool multicast = is_multicast_ether_addr(eh->h_dest);
        bool pae = eh->h_proto == htons(ETH_P_PAE);
+       int ret;
 
        /* determine the priority */
        if (!skb->priority)
@@ -1759,7 +1760,10 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)
                brcmf_proto_hdrpush(drvr, ifp->ifidx, 0, skb);
 
                /* Use bus module to send data frame */
-               return brcmf_bus_txdata(drvr->bus_if, skb);
+               ret = brcmf_bus_txdata(drvr->bus_if, skb);
+               if (ret < 0)
+                       brcmf_txfinalize(drvr, skb, false);
+               return ret;
        }
 
        /* set control buffer information */

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 322cadc51deddcbfe8d7c560dbc93669b167b574..39e01a7c8556f2ce022bd5b8c545c2e2a615af5d 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -614,7 +614,6 @@ static int brcmf_usb_tx(struct device *dev, struct sk_buff *skb)
        return 0;
 
 fail:
-       brcmf_txcomplete(dev, skb, false);
        return ret;
 }