1 files changed, 18 insertions, 9 deletions

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 53bbddfc8c95..cf3a082bc89d 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -49,8 +49,8 @@
 #include <asm/processor.h>
 
 #define DRV_NAME        "r6040"
-#define DRV_VERSION     "0.19"
-#define DRV_RELDATE     "18Dec2008"
+#define DRV_VERSION     "0.20"
+#define DRV_RELDATE     "07Jan2009"
 
 /* PHY CHIP Address */
 #define PHY1_ADDR       1       /* For MAC1 */
@@ -200,7 +200,7 @@ struct r6040_private {
 
 static char version[] __devinitdata = KERN_INFO DRV_NAME
         ": RDC R6040 NAPI net driver,"
-        "version "DRV_VERSION " (" DRV_RELDATE ")\n";
+        "version "DRV_VERSION " (" DRV_RELDATE ")";
 
 static int phy_table[] = { PHY1_ADDR, PHY2_ADDR };
 
@@ -330,7 +330,7 @@ static int r6040_alloc_rxbufs(struct net_device *dev)
         do {
                 skb = netdev_alloc_skb(dev, MAX_BUF_SIZE);
                 if (!skb) {
-                        printk(KERN_ERR "%s: failed to alloc skb for rx\n", dev->name);
+                        printk(KERN_ERR DRV_NAME "%s: failed to alloc skb for rx\n", dev->name);
                         rc = -ENOMEM;
                         goto err_exit;
                 }
@@ -1077,20 +1077,20 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         /* this should always be supported */
         err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
         if (err) {
-                printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses"
+                printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses"
                                 "not supported by the card\n");
                 goto err_out;
         }
         err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
         if (err) {
-                printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses"
+                printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses"
                                 "not supported by the card\n");
                 goto err_out;
         }
 
         /* IO Size check */
         if (pci_resource_len(pdev, 0) < io_size) {
-                printk(KERN_ERR DRV_NAME "Insufficient PCI resources, aborting\n");
+                printk(KERN_ERR DRV_NAME ": Insufficient PCI resources, aborting\n");
                 err = -EIO;
                 goto err_out;
         }
@@ -1100,7 +1100,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
 
         dev = alloc_etherdev(sizeof(struct r6040_private));
         if (!dev) {
-                printk(KERN_ERR DRV_NAME "Failed to allocate etherdev\n");
+                printk(KERN_ERR DRV_NAME ": Failed to allocate etherdev\n");
                 err = -ENOMEM;
                 goto err_out;
         }
@@ -1116,11 +1116,15 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
 
         ioaddr = pci_iomap(pdev, bar, io_size);
         if (!ioaddr) {
-                printk(KERN_ERR "ioremap failed for device %s\n",
+                printk(KERN_ERR DRV_NAME ": ioremap failed for device %s\n",
                         pci_name(pdev));
                 err = -EIO;
                 goto err_out_free_res;
         }
+        /* If PHY status change register is still set to zero it means the
+         * bootloader didn't initialize it */
+        if (ioread16(ioaddr + PHY_CC) == 0)
+                iowrite16(0x9f07, ioaddr + PHY_CC);
 
         /* Init system & device */
         lp->base = ioaddr;
@@ -1137,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;