diff options
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index cc7328b15521..74c588efa92e 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -5420,7 +5420,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5420 | u32 powerstate, txreg; | 5420 | u32 powerstate, txreg; |
5421 | u32 phystate_orig = 0, phystate; | 5421 | u32 phystate_orig = 0, phystate; |
5422 | int phyinitialized = 0; | 5422 | int phyinitialized = 0; |
5423 | DECLARE_MAC_BUF(mac); | ||
5424 | static int printed_version; | 5423 | static int printed_version; |
5425 | 5424 | ||
5426 | if (!printed_version++) | 5425 | if (!printed_version++) |
@@ -5653,8 +5652,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5653 | * to 01:23:45:67:89:ab | 5652 | * to 01:23:45:67:89:ab |
5654 | */ | 5653 | */ |
5655 | dev_printk(KERN_ERR, &pci_dev->dev, | 5654 | dev_printk(KERN_ERR, &pci_dev->dev, |
5656 | "Invalid Mac address detected: %s\n", | 5655 | "Invalid Mac address detected: %pM\n", |
5657 | print_mac(mac, dev->dev_addr)); | 5656 | dev->dev_addr); |
5658 | dev_printk(KERN_ERR, &pci_dev->dev, | 5657 | dev_printk(KERN_ERR, &pci_dev->dev, |
5659 | "Please complain to your hardware vendor. Switching to a random MAC.\n"); | 5658 | "Please complain to your hardware vendor. Switching to a random MAC.\n"); |
5660 | dev->dev_addr[0] = 0x00; | 5659 | dev->dev_addr[0] = 0x00; |
@@ -5663,8 +5662,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5663 | get_random_bytes(&dev->dev_addr[3], 3); | 5662 | get_random_bytes(&dev->dev_addr[3], 3); |
5664 | } | 5663 | } |
5665 | 5664 | ||
5666 | dprintk(KERN_DEBUG "%s: MAC Address %s\n", | 5665 | dprintk(KERN_DEBUG "%s: MAC Address %pM\n", |
5667 | pci_name(pci_dev), print_mac(mac, dev->dev_addr)); | 5666 | pci_name(pci_dev), dev->dev_addr); |
5668 | 5667 | ||
5669 | /* set mac address */ | 5668 | /* set mac address */ |
5670 | nv_copy_mac_to_hw(dev); | 5669 | nv_copy_mac_to_hw(dev); |