Project

General

Profile

Bug #164 » batman-adv_001_fix_softiface_mac_update.patch

Def D, 09/06/2012 12:03 PM

View differences:

soft-interface.c.ORG 2012-09-06 10:07:27.409364708 +0200 → soft-interface.c 2012-09-06 10:10:19.000000000 +0200
108 108
	if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) {
109 109
		batadv_tt_local_remove(bat_priv, dev->dev_addr,
110 110
				       "mac address changed", false);
111
		memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
111 112
		batadv_tt_local_add(dev, addr->sa_data, BATADV_NULL_IFINDEX);
113
	}else{
114
		memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
112 115
	}
113

  
114
	memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
116
	
115 117
	dev->addr_assign_type &= ~NET_ADDR_RANDOM;
116 118
	return 0;
117 119
}
(1-1/3)