Thread (7 messages) 7 messages, 4 authors, 2012-09-23

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix change mac address of soft iface.

From: Def <hidden>
Date: 2012-09-18 14:41:58
Subsystem: the rest · Maintainer: Linus Torvalds

 Into function interface_set_mac_addr, the function tt_local_add
 was invoked before updating dev->dev_addr. The new MAC
 addresse was not tagged as NoPurge.

---
 soft-interface.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/soft-interface.c b/soft-interface.c
index cf26e41..1345b86
--- a/soft-interface.c
+++ b/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;
 }
-- 
1.7.10.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help