diff options
| author |   Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-17 05:43:23 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-02-17 15:52:31 -0500 |
| commit | 43aabec51e0ab5d71c30530eec55963673354033 (patch) | |
| tree | 2d565ef7fa923318e9ecad5656d80b8411e0e0e1 /drivers/net/ethernet | |
| parent | au1000_eth: use eth_hw_addr_random() instead of random_ether_addr() (diff) | |
| download | linux-dev-43aabec51e0ab5d71c30530eec55963673354033.tar.xz linux-dev-43aabec51e0ab5d71c30530eec55963673354033.zip | |
lantiq_etop: set addr_assign_type if random_ether_addr() used
Set addr_assign_type correctly to NET_ADDR_RANDOM in case
a random MAC address was generated and assigned to the netdevice.
v2: added comment, renamed bool variable to random_mac
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/lantiq_etop.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 3369b7db777d..e89808ff73ed 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -634,6 +634,7 @@ ltq_etop_init(struct net_device *dev) struct ltq_etop_priv *priv = netdev_priv(dev); struct sockaddr mac; int err; + bool random_mac = false; ether_setup(dev); dev->watchdog_timeo = 10 * HZ; @@ -646,11 +647,17 @@ ltq_etop_init(struct net_device *dev) if (!is_valid_ether_addr(mac.sa_data)) { pr_warn("etop: invalid MAC, using random\n"); random_ether_addr(mac.sa_data); + random_mac = true; } err = ltq_etop_set_mac_address(dev, &mac); if (err) goto err_netdev; + + /* Set addr_assign_type here, ltq_etop_set_mac_address would reset it. */ + if (random_mac) + dev->addr_assign_type |= NET_ADDR_RANDOM; + ltq_etop_set_multicast_list(dev); err = ltq_etop_mdio_init(dev); if (err) |