From c7f61c0c4e82a5b2a41abaa2b08399c8f4082085 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 14 Nov 2012 18:46:12 -0800 Subject: [PATCH] --- yaml --- r: 341482 b: refs/heads/master c: 0b63cb71f1e6b74a6f68a9c7b10d823fd9914d0a h: refs/heads/master v: v3 --- [refs] | 2 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index c92817fa89df..eff78f0d8340 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bcb74f919db1965fa74393d4b545e7b489e91fb +refs/heads/master: 0b63cb71f1e6b74a6f68a9c7b10d823fd9914d0a diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index 9a590cb06d93..51cbc7234583 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c @@ -648,7 +648,6 @@ int brcmf_net_attach(struct brcmf_if *ifp) { struct brcmf_pub *drvr = ifp->drvr; struct net_device *ndev; - u8 temp_addr[ETH_ALEN]; brcmf_dbg(TRACE, "ifidx %d mac %pM\n", ifp->idx, ifp->mac_addr); ndev = ifp->ndev; @@ -659,21 +658,14 @@ int brcmf_net_attach(struct brcmf_if *ifp) else ndev->netdev_ops = &brcmf_netdev_ops_virt; - /* - * determine mac address to use - */ - if (is_valid_ether_addr(ifp->mac_addr)) - memcpy(temp_addr, ifp->mac_addr, ETH_ALEN); - else - memcpy(temp_addr, drvr->mac, ETH_ALEN); - 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); + /* set the mac address */ + memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN); if (register_netdev(ndev) != 0) { brcmf_dbg(ERROR, "couldn't register the net device\n");