Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43aabec5 authored by Danny Kukawka's avatar Danny Kukawka Committed by David S. Miller
Browse files

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: default avatarDanny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7718f2c2

drivers/net/ethernet/lantiq_etop.c

+7 −0
Original line number Diff line number Diff line
@@ -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)