---

yaml --- r: 127835 b: refs/heads/master c: 1d2b1a7 h: refs/heads/master i: 127833: 106d075 127831: f632982 v: v3
git-mirror · Jan 8, 2009 · bd65b33 · bd65b33
1 parent 17c6a7d
commit bd65b33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;