---

yaml --- r: 299567 b: refs/heads/master c: 716af4a h: refs/heads/master i: 299565: 5b39d97 299563: f3edcae 299559: 86c6827 299551: be89144 v: v3
git-mirror · Apr 19, 2012 · 26c83bf · 26c83bf
1 parent 1021716
commit 26c83bf
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: 22b4a4f22da4b39c6f7f679fd35f3d35c91bf851
+refs/heads/master: 716af4abd6e6370226f567af50bfaca274515980
diff --git a/trunk/drivers/net/ethernet/micrel/ksz884x.c b/trunk/drivers/net/ethernet/micrel/ksz884x.c
@@ -5675,7 +5675,7 @@ static int netdev_set_mac_address(struct net_device *dev, void *addr)
 		memcpy(hw->override_addr, mac->sa_data, ETH_ALEN);
 	}
 
-	memcpy(dev->dev_addr, mac->sa_data, MAX_ADDR_LEN);
+	memcpy(dev->dev_addr, mac->sa_data, ETH_ALEN);
 
 	interrupt = hw_block_intr(hw);