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

Commit 699b5e5b authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: change parameter in brcmf_add_if() function 



The brcmf_add_if() function had a struct device as parameter
to accomodate the bus specific code to use this function. The
driver has been reworked so the bus specific code does not need
this function. Better replace the parameter with a more specific
driver object, ie. struct brcmf_pub.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-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 7c38e698

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -586,8 +586,8 @@ extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx, 
			      void **data_ptr);

			      void **data_ptr);





extern int brcmf_net_attach(struct brcmf_if *ifp);

extern int brcmf_net_attach(struct brcmf_if *ifp);

extern struct brcmf_if *brcmf_add_if(struct device *dev, int ifidx, s32 bssidx,

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

				     char *name, u8 *mac_addr);

				     s32 bssidx, char *name, u8 *mac_addr);

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

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





#endif				/* _BRCMF_H_ */
 
#endif				/* _BRCMF_H_ */

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -694,13 +694,11 @@ int brcmf_net_attach(struct brcmf_if *ifp) 
	return -EBADE;

	return -EBADE;

}

}





struct brcmf_if *brcmf_add_if(struct device *dev, int ifidx, s32 bssidx,

struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, int ifidx, s32 bssidx,

			      char *name, u8 *mac_addr)

			      char *name, u8 *mac_addr)

{

{

	struct brcmf_if *ifp;

	struct brcmf_if *ifp;

	struct net_device *ndev;

	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);

	brcmf_dbg(TRACE, "idx %d\n", ifidx);
@@ -835,7 +833,7 @@ int brcmf_bus_start(struct device *dev) 
	}

	}





	/* add primary networking interface */

	/* add primary networking interface */

	ifp = brcmf_add_if(dev, 0, 0, "wlan%d", NULL);

	ifp = brcmf_add_if(drvr, 0, 0, "wlan%d", NULL);

	if (IS_ERR(ifp))

	if (IS_ERR(ifp))

		return PTR_ERR(ifp);

		return PTR_ERR(ifp);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -264,7 +264,7 @@ static int brcmf_fweh_process_if_event(struct brcmf_pub *drvr, 
	case BRCMF_E_IF_ADD:

	case BRCMF_E_IF_ADD:

		brcmf_dbg(EVENT, "adding %s (%pM, %pM)\n", event->ifname,

		brcmf_dbg(EVENT, "adding %s (%pM, %pM)\n", event->ifname,

			  event->addr, item->ifaddr);

			  event->addr, item->ifaddr);

		ifp = brcmf_add_if(drvr->dev, ifevent->ifidx, ifevent->bssidx,

		ifp = brcmf_add_if(drvr, ifevent->ifidx, ifevent->bssidx,

				   event->ifname, item->ifaddr);

				   event->ifname, item->ifaddr);

		if (!IS_ERR(ifp)) {

		if (!IS_ERR(ifp)) {

			*ifpp = ifp;

			*ifpp = ifp;