From bd65b33071b5936104249e60d11c8e14e6a9c7d0 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 8 Jan 2009 11:02:30 -0800
Subject: [PATCH] --- yaml --- r: 127835 b: refs/heads/master c:
 1d2b1a76d39433ba9eb065bb31d3594cb491e617 h: refs/heads/master i:   127833:
 106d0753698ae3d39c346a40d7d20004df1bc7c9   127831:
 f6329826c44089541d758594b399f3598286c414 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r6040.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 61bfcccaf550..d89eef97b366 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84314bf92265bccea601ed75ec93944e1a36dd81
+refs/heads/master: 1d2b1a76d39433ba9eb065bb31d3594cb491e617
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index 7ac6fede6e6d..3354cceb75d2 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/drivers/net/r6040.c
@@ -1141,6 +1141,11 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
 	adrp[1] = ioread16(ioaddr + MID_0M);
 	adrp[2] = ioread16(ioaddr + MID_0H);
 
+	/* Some bootloader/BIOSes do not initialize
+	 * MAC address, warn about that */
+	if (!(adrp[0] || adrp[1] || adrp[2]))
+		printk(KERN_WARNING DRV_NAME ": MAC address not initialized\n");
+
 	/* Link new device into r6040_root_dev */
 	lp->pdev = pdev;
 	lp->dev = dev;