Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b584396 authored by Franky Lin's avatar Franky Lin Committed by Kalle Valo
Browse files

brcmfmac: move brcmf_txcomplete to bcdc layer 



brcmf_txcomplete is invoked by sdio and usb bus module which are using
bcdc protocol. So move it from core module into bcdc layer.

Signed-off-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 20ec4f57

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c

+20 −0
Original line number Diff line number Diff line
@@ -355,6 +355,26 @@ void brcmf_proto_bcdc_txflowblock(struct device *dev, bool state) 
	brcmf_fws_bus_blocked(drvr, state);

}



void

brcmf_proto_bcdc_txcomplete(struct device *dev, struct sk_buff *txp,

			    bool success)

{

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;

	struct brcmf_if *ifp;



	/* await txstatus signal for firmware if active */

	if (brcmf_fws_fc_active(drvr->fws)) {

		if (!success)

			brcmf_fws_bustxfail(drvr->fws, txp);

	} else {

		if (brcmf_proto_bcdc_hdrpull(drvr, false, txp, &ifp))

			brcmu_pkt_buf_free_skb(txp);

		else

			brcmf_txfinalize(ifp, txp, success);

	}

}



static void

brcmf_proto_bcdc_configure_addr_mode(struct brcmf_pub *drvr, int ifidx,

				     enum proto_addr_mode addr_mode)

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr);

void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr);

void brcmf_proto_bcdc_txflowblock(struct device *dev, bool state);

void brcmf_proto_bcdc_txcomplete(struct device *dev, struct sk_buff *txp,

				 bool success);

#else

static inline int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) { return 0; }

static inline void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr) {}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h

+0 −3
Original line number Diff line number Diff line
@@ -230,9 +230,6 @@ void brcmf_detach(struct device *dev); 
/* Indication from bus module that dongle should be reset */

void brcmf_dev_reset(struct device *dev);



/* Notify the bus has transferred the tx packet to firmware */

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



/* Configure the "global" bus state used by upper layers */

void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+0 −18
Original line number Diff line number Diff line
@@ -383,24 +383,6 @@ void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success) 
	brcmu_pkt_buf_free_skb(txp);

}



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

{

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;

	struct brcmf_if *ifp;



	/* await txstatus signal for firmware if active */

	if (brcmf_fws_fc_active(drvr->fws)) {

		if (!success)

			brcmf_fws_bustxfail(drvr->fws, txp);

	} else {

		if (brcmf_proto_hdrpull(drvr, false, txp, &ifp))

			brcmu_pkt_buf_free_skb(txp);

		else

			brcmf_txfinalize(ifp, txp, success);

	}

}



static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,

				    struct ethtool_drvinfo *info)

{

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+2 −1
Original line number Diff line number Diff line
@@ -2266,7 +2266,8 @@ static int brcmf_sdio_txpkt(struct brcmf_sdio *bus, struct sk_buff_head *pktq, 
		bus->tx_seq = (bus->tx_seq + pktq->qlen) % SDPCM_SEQ_WRAP;

	skb_queue_walk_safe(pktq, pkt_next, tmp) {

		__skb_unlink(pkt_next, pktq);

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

		brcmf_proto_bcdc_txcomplete(bus->sdiodev->dev, pkt_next,

					    ret == 0);

	}

	return ret;

}