diff options
author | Arend van Spriel <arend@broadcom.com> | 2013-08-10 06:27:20 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-15 16:07:52 -0400 |
commit | 04779fddeff723cf5afe529e4ed67fc86f25ba37 (patch) | |
tree | 54b098098de348d01be3e1194c3a6fef25e6b5b2 /drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | |
parent | 4061f895088a2825b15312947aedb8574e2d8de5 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 5cbce1dff093..db31312eba6a 100644 --- 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) | |||
2297 | spin_lock_irqsave(&bus->txqlock, flags); | 2297 | spin_lock_irqsave(&bus->txqlock, flags); |
2298 | if (!brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec)) { | 2298 | if (!brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec)) { |
2299 | skb_pull(pkt, SDPCM_HDRLEN); | 2299 | skb_pull(pkt, SDPCM_HDRLEN); |
2300 | brcmf_txcomplete(bus->sdiodev->dev, pkt, false); | ||
2301 | brcmf_err("out of bus->txq !!!\n"); | 2300 | brcmf_err("out of bus->txq !!!\n"); |
2302 | ret = -ENOSR; | 2301 | ret = -ENOSR; |
2303 | } else { | 2302 | } else { |