---

yaml --- r: 290214 b: refs/heads/master c: 5277f7a h: refs/heads/master v: v3
git-mirror · Feb 20, 2012 · 43b2f5c · 43b2f5c
1 parent a487492
commit 43b2f5c
Show file tree

Hide file tree

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