Commit c20ec761 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

forcedeth: Use netdev_dbg for printk(KERN_DEBUG 



Use the normal debugging functions.
Print mac address when using random_ether_addr.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef46ffbc

drivers/net/forcedeth.c

+12 −7
Original line number Diff line number Diff line
@@ -3407,7 +3407,8 @@ static irqreturn_t nv_nic_irq_tx(int foo, void *data) 
				mod_timer(&np->nic_poll, jiffies + POLL_WAIT);

			}

			spin_unlock_irqrestore(&np->lock, flags);

			printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_tx.\n", dev->name, i);

			netdev_dbg(dev, "%s: too many iterations (%d)\n",

				   __func__, i);

			break;

		}
@@ -3522,7 +3523,8 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data) 
				mod_timer(&np->nic_poll, jiffies + POLL_WAIT);

			}

			spin_unlock_irqrestore(&np->lock, flags);

			printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_rx.\n", dev->name, i);

			netdev_dbg(dev, "%s: too many iterations (%d)\n",

				   __func__, i);

			break;

		}

	}
@@ -3586,7 +3588,8 @@ static irqreturn_t nv_nic_irq_other(int foo, void *data) 
				mod_timer(&np->nic_poll, jiffies + POLL_WAIT);

			}

			spin_unlock_irqrestore(&np->lock, flags);

			printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_other.\n", dev->name, i);

			netdev_dbg(dev, "%s: too many iterations (%d)\n",

				   __func__, i);

			break;

		}
@@ -5463,7 +5466,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 
		dev->dev_addr[4] = (np->orig_mac[0] >>  8) & 0xff;

		dev->dev_addr[5] = (np->orig_mac[0] >>  0) & 0xff;

		writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll);

		printk(KERN_DEBUG "nv_probe: set workaround bit for reversed mac addr\n");

		dev_dbg(&pci_dev->dev,

			"%s: set workaround bit for reversed mac addr\n",

			__func__);

	}

	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
@@ -5473,11 +5478,11 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 
		 * to 01:23:45:67:89:ab

		 */

		dev_err(&pci_dev->dev,

			"Invalid MAC address detected: %pM\n",

			"Invalid MAC address detected: %pM - Please complain to your hardware vendor.\n",

			dev->dev_addr);

		dev_err(&pci_dev->dev,

			"Please complain to your hardware vendor. Switched to a random MAC address.\n");

		random_ether_addr(dev->dev_addr);

		dev_err(&pci_dev->dev,

			"Using random MAC address: %pM\n", dev->dev_addr);

	}



	/* set mac address */