---

yaml --- r: 290201 b: refs/heads/master c: 5a5e7c3 h: refs/heads/master i: 290199: ed6e850 v: v3
git-mirror · Feb 17, 2012 · da01ec6 · da01ec6
1 parent 47de7c8
commit da01ec6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baf1d3788e513cadfa26d400b1ae7a13c949f0ff
+refs/heads/master: 5a5e7c36448664a58d13aab5a9006b01f6a58910
diff --git a/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c b/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -327,7 +327,9 @@ static int temac_set_mac_address(struct net_device *ndev, void *address)
 		memcpy(ndev->dev_addr, address, ETH_ALEN);
 
 	if (!is_valid_ether_addr(ndev->dev_addr))
-		random_ether_addr(ndev->dev_addr);
+		eth_hw_addr_random(ndev);
+	else
+		dev->addr_assign_type &= ~NET_ADDR_RANDOM;
 
 	/* set up unicast MAC address filter set its mac address */
 	mutex_lock(&lp->indirect_mutex);