---

yaml --- r: 290088 b: refs/heads/master c: c8585bd h: refs/heads/master v: v3
git-mirror · Feb 13, 2012 · 637a299 · 637a299
1 parent 6c75193
commit 637a299
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c507d2897bd9be810b3403ade73b04cf6fdfd4a
+refs/heads/master: c8585bd89e2e3c87eab6ca711e09b3af20fd469b
diff --git a/trunk/net/ethernet/eth.c b/trunk/net/ethernet/eth.c
@@ -288,6 +288,8 @@ int eth_mac_addr(struct net_device *dev, void *p)
 	if (!is_valid_ether_addr(addr->sa_data))
 		return -EADDRNOTAVAIL;
 	memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+	/* if device marked as NET_ADDR_RANDOM, reset it */
+	dev->addr_assign_type &= ~NET_ADDR_RANDOM;
 	return 0;
 }
 EXPORT_SYMBOL(eth_mac_addr);