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

brcm80211: fmac: change function add_if parameter 



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

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

+2 −1
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ struct brcmf_dcmd { 
struct brcmf_bus {

	u8 type;		/* bus type */

	void *bus_priv;		/* pointer to bus private structure */

	void *drvr;		/* pointer to driver pub structure brcmf_pub */

	enum brcmf_bus_state state;

};
@@ -743,7 +744,7 @@ extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx, 
			      void *pktdata, struct brcmf_event_msg *,

			      void **data_ptr);



extern int brcmf_add_if(struct brcmf_pub *drvr, int ifidx,

extern int brcmf_add_if(struct device *dev, int ifidx,

			char *name, u8 *mac_addr);

extern void brcmf_del_if(struct brcmf_pub *drvr, int ifidx);

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

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata, 


		if (ifevent->ifidx > 0 && ifevent->ifidx < BRCMF_MAX_IFS) {

			if (ifevent->action == BRCMF_E_IF_ADD)

				brcmf_add_if(drvr, ifevent->ifidx,

				brcmf_add_if(drvr->dev, ifevent->ifidx,

					     event->ifname,

					     pvt_data->eth.h_dest);

			else

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

+5 −1
Original line number Diff line number Diff line
@@ -840,10 +840,12 @@ static const struct net_device_ops brcmf_netdev_ops_pri = { 
};



int

brcmf_add_if(struct brcmf_pub *drvr, int ifidx, char *name, u8 *mac_addr)

brcmf_add_if(struct device *dev, int ifidx, char *name, u8 *mac_addr)

{

	struct brcmf_if *ifp;

	struct net_device *ndev;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;



	brcmf_dbg(TRACE, "idx %d\n", ifidx);
@@ -937,6 +939,7 @@ struct brcmf_pub *brcmf_attach(struct brcmf_sdio *bus, uint bus_hdrlen, 
	drvr->bus = bus;

	drvr->hdrlen = bus_hdrlen;

	drvr->bus_if = dev_get_drvdata(dev);

	drvr->bus_if->drvr = drvr;

	drvr->dev = dev;



	/* Attach and link in the protocol */
@@ -1108,6 +1111,7 @@ void brcmf_detach(struct brcmf_pub *drvr) 
		if (drvr->prot)

			brcmf_proto_detach(drvr);



		drvr->bus_if->drvr = NULL;

		kfree(drvr);

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -3980,7 +3980,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev) 
	}



	/* add interface and open for business */

	if (brcmf_add_if(bus->drvr, 0, "wlan%d", NULL)) {

	if (brcmf_add_if(bus->sdiodev->dev, 0, "wlan%d", NULL)) {

		brcmf_dbg(ERROR, "Add primary net device interface failed!!\n");

		goto fail;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE