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

Commit 66b9aa02 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove brcmfmac interface name override 



The brcmfmac had a module parameter which could be used to override
the name of the wireless net device name and it defaults to 'wlan'.
This is considered rather useless, because what is in a name.

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5a8dc2ef

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+7 −21
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ struct brcmf_info { 
/* Error bits */

module_param(brcmf_msg_level, int, 0);



/* Network inteface name */

char iface_name[IFNAMSIZ] = "wlan";

module_param_string(iface_name, iface_name, IFNAMSIZ, 0);



static int brcmf_net2idx(struct brcmf_info *drvr_priv, struct net_device *net)

{
@@ -311,10 +308,11 @@ static void brcmf_op_if(struct brcmf_if *ifp) 
			unregister_netdev(ifp->net);

			free_netdev(ifp->net);

		}

		/* Allocate etherdev, including space for private structure */

		ifp->net = alloc_etherdev(sizeof(drvr_priv));

		/* Allocate netdev, including space for private structure */

		ifp->net = alloc_netdev(sizeof(drvr_priv), "wlan%d",

					ether_setup);

		if (!ifp->net) {

			brcmf_dbg(ERROR, "OOM - alloc_etherdev\n");

			brcmf_dbg(ERROR, "OOM - alloc_netdev\n");

			ret = -ENOMEM;

		}

		if (ret == 0) {
@@ -1009,10 +1007,10 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen) 


	brcmf_dbg(TRACE, "Enter\n");



	/* Allocate etherdev, including space for private structure */

	net = alloc_etherdev(sizeof(drvr_priv));

	/* Allocate netdev, including space for private structure */

	net = alloc_netdev(sizeof(drvr_priv), "wlan%d", ether_setup);

	if (!net) {

		brcmf_dbg(ERROR, "OOM - alloc_etherdev\n");

		brcmf_dbg(ERROR, "OOM - alloc_netdev\n");

		goto fail;

	}
@@ -1028,18 +1026,6 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen) 
	 */

	memcpy(netdev_priv(net), &drvr_priv, sizeof(drvr_priv));



	/* Set network interface name if it was provided as module parameter */

	if (iface_name[0]) {

		int len;

		char ch;

		strncpy(net->name, iface_name, IFNAMSIZ);

		net->name[IFNAMSIZ - 1] = 0;

		len = strlen(net->name);

		ch = net->name[len - 1];

		if ((ch > '9' || ch < '0') && (len < IFNAMSIZ - 2))

			strcat(net->name, "%d");

	}



	if (brcmf_add_if(drvr_priv, 0, net, net->name, NULL, 0, 0) ==

	    BRCMF_BAD_IF)

		goto fail;