Commit c995788f authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: change function txcomplete parameter 



Change parameter to device pointer for bus layer interface function
brcmf_txcomplete. This is part of the fullmac bus interface
refactoring.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2b459056

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static inline void brcmf_rx_packet(struct brcmf_pub *drvr, int ifidx, 
extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx);



/* Notify tx completion */

extern void brcmf_txcomplete(struct brcmf_pub *drvr, struct sk_buff *txp,

extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp,

			     bool success);



/* Query dongle */

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+3 −1
Original line number Diff line number Diff line
@@ -460,11 +460,13 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, 
	}

}



void brcmf_txcomplete(struct brcmf_pub *drvr, struct sk_buff *txp, bool success)

void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)

{

	uint ifidx;

	struct ethhdr *eh;

	u16 type;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;



	brcmf_proto_hdrpull(drvr, &ifidx, txp);

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -2230,7 +2230,7 @@ done: 
	/* restore pkt buffer pointer before calling tx complete routine */

	skb_pull(pkt, SDPCM_HDRLEN + pad);

	up(&bus->sdsem);

	brcmf_txcomplete(bus->drvr, pkt, ret != 0);

	brcmf_txcomplete(bus->sdiodev->dev, pkt, ret != 0);

	down(&bus->sdsem);



	if (free_pkt)
@@ -2592,7 +2592,7 @@ int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt) 
	spin_lock_bh(&bus->txqlock);

	if (brcmf_c_prec_enq(bus->drvr, &bus->txq, pkt, prec) == false) {

		skb_pull(pkt, SDPCM_HDRLEN);

		brcmf_txcomplete(bus->drvr, pkt, false);

		brcmf_txcomplete(bus->sdiodev->dev, pkt, false);

		brcmu_pkt_buf_free_skb(pkt);

		brcmf_dbg(ERROR, "out of bus->txq !!!\n");

		ret = -ENOSR;

CRA Git | Maintained and supported by SUSTech CRA and CCSE