From 26c83bf3473cb8092f11304c80dc3fd8a948399a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 19 Apr 2012 10:00:19 +0300
Subject: [PATCH] --- yaml --- r: 299567 b: refs/heads/master c:
 716af4abd6e6370226f567af50bfaca274515980 h: refs/heads/master i:   299565:
 5b39d9755791a9877ae3476d095ceed827486e01   299563:
 f3edcae2a224a8c64627a67567f9e7be347a10d4   299559:
 86c6827c4bf26156f5e4cfd7cab5eeba5e376300   299551:
 be89144db1f65079a9d4b505a439bcd51e7b527f v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/ethernet/micrel/ksz884x.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 589558c77d5f..7634a0701747 100644
--- 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
index ef723b185d85..eaf9ff0262a9 100644
--- 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);