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

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

brcm80211: fmac: make brcmf_net_attach() static 



The function brcmf_net_attach() is only used within dhd_linux.c so
it does not need to be extern. This patch makes the function static.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0446b49c

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -632,7 +632,6 @@ extern const struct bcmevent_name bcmevent_names[]; 
extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen,

extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen,

			  char *buf, uint len);

			  char *buf, uint len);





extern int brcmf_net_attach(struct brcmf_pub *drvr, int idx);

extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev);

extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev);





extern s32 brcmf_exec_dcmd(struct net_device *dev, u32 cmd, void *arg, u32 len);

extern s32 brcmf_exec_dcmd(struct net_device *dev, u32 cmd, void *arg, u32 len);

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

+58 −58
Original line number Original line Diff line number Diff line
@@ -843,6 +843,64 @@ static const struct net_device_ops brcmf_netdev_ops_pri = { 
	.ndo_set_rx_mode = brcmf_netdev_set_multicast_list

	.ndo_set_rx_mode = brcmf_netdev_set_multicast_list

};

};





static int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)

{

	struct net_device *ndev;

	u8 temp_addr[ETH_ALEN] = {

		0x00, 0x90, 0x4c, 0x11, 0x22, 0x33};



	brcmf_dbg(TRACE, "ifidx %d\n", ifidx);



	ndev = drvr->iflist[ifidx]->ndev;

	ndev->netdev_ops = &brcmf_netdev_ops_pri;



	/*

	 * We have to use the primary MAC for virtual interfaces

	 */

	if (ifidx != 0) {

		/* for virtual interfaces use the primary MAC  */

		memcpy(temp_addr, drvr->mac, ETH_ALEN);



	}



	if (ifidx == 1) {

		brcmf_dbg(TRACE, "ACCESS POINT MAC:\n");

		/*  ACCESSPOINT INTERFACE CASE */

		temp_addr[0] |= 0X02;	/* set bit 2 ,

			 - Locally Administered address  */



	}

	ndev->hard_header_len = ETH_HLEN + drvr->hdrlen;

	ndev->ethtool_ops = &brcmf_ethtool_ops;



	drvr->rxsz = ndev->mtu + ndev->hard_header_len +

			      drvr->hdrlen;



	memcpy(ndev->dev_addr, temp_addr, ETH_ALEN);



	/* attach to cfg80211 for primary interface */

	if (!ifidx) {

		drvr->config = brcmf_cfg80211_attach(ndev, drvr->dev, drvr);

		if (drvr->config == NULL) {

			brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");

			goto fail;

		}

	}



	if (register_netdev(ndev) != 0) {

		brcmf_dbg(ERROR, "couldn't register the net device\n");

		goto fail;

	}



	brcmf_dbg(INFO, "%s: Broadcom Dongle Host Driver\n", ndev->name);



	return 0;



fail:

	ndev->netdev_ops = NULL;

	return -EBADE;

}



int

int

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

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

{

{
@@ -1021,64 +1079,6 @@ int brcmf_bus_start(struct device *dev) 
	return 0;

	return 0;

}

}





int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)

{

	struct net_device *ndev;

	u8 temp_addr[ETH_ALEN] = {

		0x00, 0x90, 0x4c, 0x11, 0x22, 0x33};



	brcmf_dbg(TRACE, "ifidx %d\n", ifidx);



	ndev = drvr->iflist[ifidx]->ndev;

	ndev->netdev_ops = &brcmf_netdev_ops_pri;



	/*

	 * We have to use the primary MAC for virtual interfaces

	 */

	if (ifidx != 0) {

		/* for virtual interfaces use the primary MAC  */

		memcpy(temp_addr, drvr->mac, ETH_ALEN);



	}



	if (ifidx == 1) {

		brcmf_dbg(TRACE, "ACCESS POINT MAC:\n");

		/*  ACCESSPOINT INTERFACE CASE */

		temp_addr[0] |= 0X02;	/* set bit 2 ,

			 - Locally Administered address  */



	}

	ndev->hard_header_len = ETH_HLEN + drvr->hdrlen;

	ndev->ethtool_ops = &brcmf_ethtool_ops;



	drvr->rxsz = ndev->mtu + ndev->hard_header_len +

			      drvr->hdrlen;



	memcpy(ndev->dev_addr, temp_addr, ETH_ALEN);



	/* attach to cfg80211 for primary interface */

	if (!ifidx) {

		drvr->config = brcmf_cfg80211_attach(ndev, drvr->dev, drvr);

		if (drvr->config == NULL) {

			brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");

			goto fail;

		}

	}



	if (register_netdev(ndev) != 0) {

		brcmf_dbg(ERROR, "couldn't register the net device\n");

		goto fail;

	}



	brcmf_dbg(INFO, "%s: Broadcom Dongle Host Driver\n", ndev->name);



	return 0;



fail:

	ndev->netdev_ops = NULL;

	return -EBADE;

}



static void brcmf_bus_detach(struct brcmf_pub *drvr)

static void brcmf_bus_detach(struct brcmf_pub *drvr)

{

{

	brcmf_dbg(TRACE, "Enter\n");

	brcmf_dbg(TRACE, "Enter\n");