From 40c9101ab89b7bfc8c09d10797a77eb7e46b444d Mon Sep 17 00:00:00 2001
From: Sven Schnelle <svens@stackframe.org>
Date: Mon, 9 Jun 2008 16:33:57 -0700
Subject: [PATCH] --- yaml --- r: 102879 b: refs/heads/master c:
 d1d5741d8568c268ec234a5b35af4a04498be6d8 h: refs/heads/master i:   102877:
 889389313074ca96f9d779d5d2bd663c047ee0f8   102875:
 9cf5447838388f361d7ab12039d329af09672670   102871:
 c4eaeca456afcdb5d04c55c2da9b3bbdb041393f   102863:
 6666f1ea66059e89ad787810cc0f3aabdee5746c   102847:
 09fa224051c32fad3a0cc78b2cee99f44f0f5ee1 v: v3

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

diff --git a/[refs] b/[refs]
index a5d6db719368..0583822a7a0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86a74ff21a7ac4bc06b18076ddb0347712b46cfd
+refs/heads/master: d1d5741d8568c268ec234a5b35af4a04498be6d8
diff --git a/trunk/drivers/net/macb.c b/trunk/drivers/net/macb.c
index 92dccd43bdca..e34630252cef 100644
--- a/trunk/drivers/net/macb.c
+++ b/trunk/drivers/net/macb.c
@@ -80,8 +80,12 @@ static void __init macb_get_hwaddr(struct macb *bp)
 	addr[4] = top & 0xff;
 	addr[5] = (top >> 8) & 0xff;
 
-	if (is_valid_ether_addr(addr))
+	if (is_valid_ether_addr(addr)) {
 		memcpy(bp->dev->dev_addr, addr, sizeof(addr));
+	} else {
+		dev_info(&bp->pdev->dev, "invalid hw address, using random\n");
+		random_ether_addr(bp->dev->dev_addr);
+	}
 }
 
 static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)