Commit f461a294 authored by Franky Lin's avatar Franky Lin Committed by Greg Kroah-Hartman

staging: brcm80211: clean up struct brcmf_if in fullmac

Some elements in structure brcmf_if are unused at all or
redundant. This patch cleans it up.
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5d3e78ee
...@@ -58,11 +58,7 @@ struct brcmf_if { ...@@ -58,11 +58,7 @@ struct brcmf_if {
struct net_device_stats stats; struct net_device_stats stats;
int idx; /* iface idx in dongle */ int idx; /* iface idx in dongle */
int state; /* interface state */ int state; /* interface state */
uint subunit; /* subunit */
u8 mac_addr[ETH_ALEN]; /* assigned MAC address */ u8 mac_addr[ETH_ALEN]; /* assigned MAC address */
bool attached; /* Delayed attachment when unset */
bool txflowcontrol; /* Per interface flow control indicator */
char name[IFNAMSIZ]; /* linux interface name */
}; };
/* Local private structure (extension of pub) */ /* Local private structure (extension of pub) */
...@@ -100,14 +96,16 @@ static int brcmf_net2idx(struct brcmf_info *drvr_priv, struct net_device *ndev) ...@@ -100,14 +96,16 @@ static int brcmf_net2idx(struct brcmf_info *drvr_priv, struct net_device *ndev)
int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name) int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name)
{ {
int i = BRCMF_MAX_IFS; int i = BRCMF_MAX_IFS;
struct brcmf_if *ifp;
if (name == NULL || *name == '\0') if (name == NULL || *name == '\0')
return 0; return 0;
while (--i > 0) while (--i > 0) {
if (drvr_priv->iflist[i] ifp = drvr_priv->iflist[i];
&& !strncmp(drvr_priv->iflist[i]->name, name, IFNAMSIZ)) if (ifp && !strncmp(ifp->ndev->name, name, IFNAMSIZ))
break; break;
}
brcmf_dbg(TRACE, "return idx %d for \"%s\"\n", i, name); brcmf_dbg(TRACE, "return idx %d for \"%s\"\n", i, name);
...@@ -315,7 +313,6 @@ static void brcmf_op_if(struct brcmf_if *ifp) ...@@ -315,7 +313,6 @@ static void brcmf_op_if(struct brcmf_if *ifp)
ret = -ENOMEM; ret = -ENOMEM;
} }
if (ret == 0) { if (ret == 0) {
strcpy(ifp->ndev->name, ifp->name);
memcpy(netdev_priv(ifp->ndev), &drvr_priv, memcpy(netdev_priv(ifp->ndev), &drvr_priv,
sizeof(drvr_priv)); sizeof(drvr_priv));
err = brcmf_net_attach(&drvr_priv->pub, ifp->idx); err = brcmf_net_attach(&drvr_priv->pub, ifp->idx);
...@@ -980,7 +977,6 @@ brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, struct net_device *ndev, ...@@ -980,7 +977,6 @@ brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, struct net_device *ndev,
memset(ifp, 0, sizeof(struct brcmf_if)); memset(ifp, 0, sizeof(struct brcmf_if));
ifp->info = drvr_priv; ifp->info = drvr_priv;
drvr_priv->iflist[ifidx] = ifp; drvr_priv->iflist[ifidx] = ifp;
strlcpy(ifp->name, name, IFNAMSIZ);
if (mac_addr != NULL) if (mac_addr != NULL)
memcpy(&ifp->mac_addr, mac_addr, ETH_ALEN); memcpy(&ifp->mac_addr, mac_addr, ETH_ALEN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment