UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: bgmac: store MAC address directly in netdev->dev_addr 

After commit 34a5102c32 ("net: bgmac: allocate struct bgmac just once
& don't copy it") the mac_addr member of struct bgmac is no longer
necessary to pass the MAC address to bgmac_enet_probe(). Instead it can
directly be stored in netdev->dev_addr.

Also use eth_hw_addr_random() instead of eth_random_addr() in case a
random MAC is nedded. This will make sure netdev->addr_assign_type will
be properly set.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tobias Klauser 2017-02-16 15:11:19 +01:00 committed by David S. Miller
parent 3105dfb2a9
commit 6850f8b509
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/broadcom/bgmac-bcma.c
View File

@ -144,7 +144,7 @@ static int bgmac_probe(struct bcma_device *core)
goto err;
}
ether_addr_copy(bgmac->mac_addr, mac);
ether_addr_copy(bgmac->net_dev->dev_addr, mac);
/* On BCM4706 we need common core to access PHY */
if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&

2
drivers/net/ethernet/broadcom/bgmac-platform.c
View File

@ -169,7 +169,7 @@ static int bgmac_probe(struct platform_device *pdev)
mac_addr = of_get_mac_address(np);
if (mac_addr)
ether_addr_copy(bgmac->mac_addr, mac_addr);
ether_addr_copy(bgmac->net_dev->dev_addr, mac_addr);
else
dev_warn(&pdev->dev, "MAC address not present in device tree\n");

9
drivers/net/ethernet/broadcom/bgmac.c
View File

@ -1477,14 +1477,13 @@ int bgmac_enet_probe(struct bgmac *bgmac)
net_dev->irq = bgmac->irq;
SET_NETDEV_DEV(net_dev, bgmac->dev);
if (!is_valid_ether_addr(bgmac->mac_addr)) {
if (!is_valid_ether_addr(net_dev->dev_addr)) {
dev_err(bgmac->dev, "Invalid MAC addr: %pM\n",
bgmac->mac_addr);
eth_random_addr(bgmac->mac_addr);
net_dev->dev_addr);
eth_hw_addr_random(net_dev);
dev_warn(bgmac->dev, "Using random MAC: %pM\n",
bgmac->mac_addr);
net_dev->dev_addr);
}
ether_addr_copy(net_dev->dev_addr, bgmac->mac_addr);
/* This (reset &) enable is not preset in specs or reference driver but
* Broadcom does it in arch PCI code when enabling fake PCI device.

1
drivers/net/ethernet/broadcom/bgmac.h
View File

@ -474,7 +474,6 @@ struct bgmac {
struct device *dev;
struct device *dma_dev;
unsigned char mac_addr[ETH_ALEN];
u32 feature_flags;
struct net_device *net_dev;