diff options
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 109ea2aae96..21c53577c8d 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -100,18 +100,21 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)  {  	struct batadv_priv *bat_priv = netdev_priv(dev);  	struct sockaddr *addr = p; +	uint8_t old_addr[ETH_ALEN];  	if (!is_valid_ether_addr(addr->sa_data))  		return -EADDRNOTAVAIL; +	memcpy(old_addr, dev->dev_addr, ETH_ALEN); +	memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); +  	/* only modify transtable if it has been initialized before */  	if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) { -		batadv_tt_local_remove(bat_priv, dev->dev_addr, +		batadv_tt_local_remove(bat_priv, old_addr,  				       "mac address changed", false);  		batadv_tt_local_add(dev, addr->sa_data, BATADV_NULL_IFINDEX);  	} -	memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);  	dev->addr_assign_type &= ~NET_ADDR_RANDOM;  	return 0;  }  |