aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 1b165a8c74f3..b9cde65e7f31 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -285,6 +285,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
285 int valid_mac = 0; 285 int valid_mac = 0;
286 u32 val; 286 u32 val;
287 int pci_func_id = PCI_FUNC(pdev->devfn); 287 int pci_func_id = PCI_FUNC(pdev->devfn);
288 DECLARE_MAC_BUF(mac);
288 289
289 printk(KERN_INFO "%s \n", netxen_nic_driver_string); 290 printk(KERN_INFO "%s \n", netxen_nic_driver_string);
290 291
@@ -573,15 +574,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
573 memcpy(netdev->perm_addr, netdev->dev_addr, 574 memcpy(netdev->perm_addr, netdev->dev_addr,
574 netdev->addr_len); 575 netdev->addr_len);
575 if (!is_valid_ether_addr(netdev->perm_addr)) { 576 if (!is_valid_ether_addr(netdev->perm_addr)) {
576 printk(KERN_ERR "%s: Bad MAC address " 577 printk(KERN_ERR "%s: Bad MAC address %s.\n",
577 "%02x:%02x:%02x:%02x:%02x:%02x.\n", 578 netxen_nic_driver_name,
578 netxen_nic_driver_name, 579 print_mac(mac, netdev->dev_addr));
579 netdev->dev_addr[0],
580 netdev->dev_addr[1],
581 netdev->dev_addr[2],
582 netdev->dev_addr[3],
583 netdev->dev_addr[4],
584 netdev->dev_addr[5]);
585 } else { 580 } else {
586 if (adapter->macaddr_set) 581 if (adapter->macaddr_set)
587 adapter->macaddr_set(adapter, 582 adapter->macaddr_set(adapter,