aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2012-11-14 21:46:12 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-11-16 14:28:53 -0500
commit0b63cb71f1e6b74a6f68a9c7b10d823fd9914d0a (patch)
tree62c7b1a6b54f4130b68e1eb92b0d66090f8f19f9
parent9bcb74f919db1965fa74393d4b545e7b489e91fb (diff)
brcmfmac: remove mac address validation from brcmf_net_attach()
The mac_addr field in ifp object is always valid so no need to validate. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 9a590cb06d93..51cbc7234583 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -648,7 +648,6 @@ int brcmf_net_attach(struct brcmf_if *ifp)
648{ 648{
649 struct brcmf_pub *drvr = ifp->drvr; 649 struct brcmf_pub *drvr = ifp->drvr;
650 struct net_device *ndev; 650 struct net_device *ndev;
651 u8 temp_addr[ETH_ALEN];
652 651
653 brcmf_dbg(TRACE, "ifidx %d mac %pM\n", ifp->idx, ifp->mac_addr); 652 brcmf_dbg(TRACE, "ifidx %d mac %pM\n", ifp->idx, ifp->mac_addr);
654 ndev = ifp->ndev; 653 ndev = ifp->ndev;
@@ -659,21 +658,14 @@ int brcmf_net_attach(struct brcmf_if *ifp)
659 else 658 else
660 ndev->netdev_ops = &brcmf_netdev_ops_virt; 659 ndev->netdev_ops = &brcmf_netdev_ops_virt;
661 660
662 /*
663 * determine mac address to use
664 */
665 if (is_valid_ether_addr(ifp->mac_addr))
666 memcpy(temp_addr, ifp->mac_addr, ETH_ALEN);
667 else
668 memcpy(temp_addr, drvr->mac, ETH_ALEN);
669
670 ndev->hard_header_len = ETH_HLEN + drvr->hdrlen; 661 ndev->hard_header_len = ETH_HLEN + drvr->hdrlen;
671 ndev->ethtool_ops = &brcmf_ethtool_ops; 662 ndev->ethtool_ops = &brcmf_ethtool_ops;
672 663
673 drvr->rxsz = ndev->mtu + ndev->hard_header_len + 664 drvr->rxsz = ndev->mtu + ndev->hard_header_len +
674 drvr->hdrlen; 665 drvr->hdrlen;
675 666
676 memcpy(ndev->dev_addr, temp_addr, ETH_ALEN); 667 /* set the mac address */
668 memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
677 669
678 if (register_netdev(ndev) != 0) { 670 if (register_netdev(ndev) != 0) {
679 brcmf_dbg(ERROR, "couldn't register the net device\n"); 671 brcmf_dbg(ERROR, "couldn't register the net device\n");