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

brcm80211: fmac: change function txflowcontrol parameter 



Change parameter to device pointer for bus layer interface function
brcmf_txflowcontrol. 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 5f947ad9

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

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ extern s32 brcmf_exec_dcmd(struct net_device *dev, u32 cmd, void *arg, u32 len); 
extern void brcmf_detach(struct device *dev);



/* Indication from bus module to change flow-control state */

extern void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool on);

extern void brcmf_txflowcontrol(struct device *dev, int ifidx, bool on);



extern bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,

			 struct sk_buff *pkt, int prec);

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

+3 −1
Original line number Diff line number Diff line
@@ -348,9 +348,11 @@ done: 
	return 0;

}



void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool state)

void brcmf_txflowcontrol(struct device *dev, int ifidx, bool state)

{

	struct net_device *ndev;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;



	brcmf_dbg(TRACE, "Enter\n");

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

+2 −2
Original line number Diff line number Diff line
@@ -2289,7 +2289,7 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes) 
	/* Deflow-control stack if needed */

	if (drvr->up && (drvr->bus_if->state == BRCMF_BUS_DATA) &&

	    drvr->txoff && (pktq_len(&bus->txq) < TXLOW))

		brcmf_txflowcontrol(drvr, 0, OFF);

		brcmf_txflowcontrol(bus->sdiodev->dev, 0, OFF);



	return cnt;

}
@@ -2602,7 +2602,7 @@ int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt) 
	spin_unlock_bh(&bus->txqlock);



	if (pktq_len(&bus->txq) >= TXHI)

		brcmf_txflowcontrol(bus->drvr, 0, ON);

		brcmf_txflowcontrol(bus->sdiodev->dev, 0, ON);



#ifdef BCMDBG

	if (pktq_plen(&bus->txq, prec) > qcount[prec])

CRA Git | Maintained and supported by SUSTech CRA and CCSE