diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/netxen/netxen_nic_main.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.
I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 6ef3f0d84bcf..33caca90e80c 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -439,7 +439,6 @@ netxen_read_mac_addr(struct netxen_adapter *adapter) | |||
439 | int i; | 439 | int i; |
440 | unsigned char *p; | 440 | unsigned char *p; |
441 | __le64 mac_addr; | 441 | __le64 mac_addr; |
442 | DECLARE_MAC_BUF(mac); | ||
443 | struct net_device *netdev = adapter->netdev; | 442 | struct net_device *netdev = adapter->netdev; |
444 | struct pci_dev *pdev = adapter->pdev; | 443 | struct pci_dev *pdev = adapter->pdev; |
445 | 444 | ||
@@ -462,10 +461,9 @@ netxen_read_mac_addr(struct netxen_adapter *adapter) | |||
462 | 461 | ||
463 | /* set station address */ | 462 | /* set station address */ |
464 | 463 | ||
465 | if (!is_valid_ether_addr(netdev->perm_addr)) { | 464 | if (!is_valid_ether_addr(netdev->perm_addr)) |
466 | dev_warn(&pdev->dev, "Bad MAC address %s.\n", | 465 | dev_warn(&pdev->dev, "Bad MAC address %pM.\n", netdev->dev_addr); |
467 | print_mac(mac, netdev->dev_addr)); | 466 | else |
468 | } else | ||
469 | adapter->macaddr_set(adapter, netdev->dev_addr); | 467 | adapter->macaddr_set(adapter, netdev->dev_addr); |
470 | 468 | ||
471 | return 0; | 469 | return 0; |