From 1af3ad92cdabd9ac241faed6a23f3ef88f7ca731 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Mon, 13 Apr 2009 14:31:51 -0700
Subject: [PATCH] --- yaml --- r: 143431 b: refs/heads/master c:
 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 h: refs/heads/master i:   143429:
 fad2cb5db07d519661560fe42bf22df19e1280ba   143427:
 40231c33a12035be25fa8654cca84cba8e5c0086   143423:
 c732cb3b2fd22fc73cd7e9608027fa7fe7995146 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b671ac61ce4a..42046cdfded7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a31bec014449dc9ca994e4c1dbf2802b7ca458a
+refs/heads/master: 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 6a736dda3ee2..7a837c465960 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -12443,8 +12443,13 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
 		/* Next, try NVRAM. */
 		if (!tg3_nvram_read_be32(tp, mac_offset + 0, &hi) &&
 		    !tg3_nvram_read_be32(tp, mac_offset + 4, &lo)) {
-			memcpy(&dev->dev_addr[0], ((char *)&hi) + 2, 2);
-			memcpy(&dev->dev_addr[2], (char *)&lo, sizeof(lo));
+			dev->dev_addr[0] = ((hi >> 16) & 0xff);
+			dev->dev_addr[1] = ((hi >> 24) & 0xff);
+			dev->dev_addr[2] = ((lo >>  0) & 0xff);
+			dev->dev_addr[3] = ((lo >>  8) & 0xff);
+			dev->dev_addr[4] = ((lo >> 16) & 0xff);
+			dev->dev_addr[5] = ((lo >> 24) & 0xff);
+
 		}
 		/* Finally just fetch it out of the MAC control regs. */
 		else {