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

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

brcm80211: fmac: change function bus_txdata parameter 



Change parameter to device pointer for bus layer interface function
brcmf_sdbrcm_bus_txdata. 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>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 47a1ce78

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ extern void brcmf_sdbrcm_bus_stop(struct brcmf_sdio *bus); 
extern int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr);



/* Send a data frame to the dongle.  Callee disposes of txp. */

extern int brcmf_sdbrcm_bus_txdata(struct brcmf_sdio *bus, struct sk_buff *txp);

extern int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *txp);



/* Send/receive a control message to/from the dongle.

 * Expects caller to enforce a single outstanding transaction.

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

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx, struct sk_buff *pktbuf) 
	brcmf_proto_hdrpush(drvr, ifidx, pktbuf);



	/* Use bus module to send data frame */

	return brcmf_sdbrcm_bus_txdata(drvr->bus, pktbuf);

	return brcmf_sdbrcm_bus_txdata(drvr->dev, pktbuf);

}



static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev)

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

+4 −1
Original line number Diff line number Diff line
@@ -2565,10 +2565,13 @@ static int brcmf_sdbrcm_dpc_thread(void *data) 
	return 0;

}



int brcmf_sdbrcm_bus_txdata(struct brcmf_sdio *bus, struct sk_buff *pkt)

int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)

{

	int ret = -EBADE;

	uint datalen, prec;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;

	struct brcmf_sdio *bus = sdiodev->bus;



	brcmf_dbg(TRACE, "Enter\n");