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

brcm80211: fmac: change function brcmf_c_prec_enq parameter 



Change parameter to device pointer for bus layer interface function
brcmf_c_prec_enq. 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 c995788f

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

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ extern void brcmf_detach(struct device *dev); 
/* Indication from bus module to change flow-control state */

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



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

extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,

			 struct sk_buff *pkt, int prec);



/* Receive frame for delivery to OS.  Callee disposes of rxp. */

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

+3 −1
Original line number Diff line number Diff line
@@ -83,12 +83,14 @@ brcmf_c_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen) 
	return len;

}



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

bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,

		      struct sk_buff *pkt, int prec)

{

	struct sk_buff *p;

	int eprec = -1;		/* precedence to evict from */

	bool discard_oldest;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;



	/* Fast case, precedence queue is not full and we are also not

	 * exceeding total queue length

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

+2 −1
Original line number Diff line number Diff line
@@ -2590,7 +2590,8 @@ int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt) 


	/* Priority based enq */

	spin_lock_bh(&bus->txqlock);

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

	if (brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec) ==

	    false) {

		skb_pull(pkt, SDPCM_HDRLEN);

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

		brcmu_pkt_buf_free_skb(pkt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE