lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: remove brcmfmac interface name override

Browse Source 
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: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arend van Spriel
2011-09-16 12:28:04 -07:00
committed by Greg Kroah-Hartman
parent 5a8dc2ef78
commit 66b9aa0245
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View File

@@ -82,9 +82,6 @@ struct brcmf_info {
/* Error bits */ /* Error bits */
module_param(brcmf_msg_level, int, 0); 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) 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); unregister_netdev(ifp->net);
free_netdev(ifp->net); free_netdev(ifp->net);
} }
/* Allocate etherdev, including space for private structure */ /* Allocate netdev, including space for private structure */
ifp->net = alloc_etherdev(sizeof(drvr_priv)); ifp->net = alloc_netdev(sizeof(drvr_priv), "wlan%d",
ether_setup);
if (!ifp->net) { if (!ifp->net) {
brcmf_dbg(ERROR, "OOM - alloc_etherdev\n"); brcmf_dbg(ERROR, "OOM - alloc_netdev\n");
ret = -ENOMEM; ret = -ENOMEM;
} }
if (ret == 0) { if (ret == 0) {
@@ -1009,10 +1007,10 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
brcmf_dbg(TRACE, "Enter\n"); brcmf_dbg(TRACE, "Enter\n");
/* Allocate etherdev, including space for private structure */ /* Allocate netdev, including space for private structure */
net = alloc_etherdev(sizeof(drvr_priv)); net = alloc_netdev(sizeof(drvr_priv), "wlan%d", ether_setup);
if (!net) { if (!net) {
brcmf_dbg(ERROR, "OOM - alloc_etherdev\n"); brcmf_dbg(ERROR, "OOM - alloc_netdev\n");
goto fail; 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)); 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) == if (brcmf_add_if(drvr_priv, 0, net, net->name, NULL, 0, 0) ==
BRCMF_BAD_IF) BRCMF_BAD_IF)
goto fail; goto fail;