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_niu.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_niu.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_niu.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c index 27f07f6a45b..c3b9c83b32f 100644 --- a/drivers/net/netxen/netxen_nic_niu.c +++ b/drivers/net/netxen/netxen_nic_niu.c | |||
@@ -608,7 +608,6 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter, | |||
608 | int phy = adapter->physical_port; | 608 | int phy = adapter->physical_port; |
609 | unsigned char mac_addr[6]; | 609 | unsigned char mac_addr[6]; |
610 | int i; | 610 | int i; |
611 | DECLARE_MAC_BUF(mac); | ||
612 | 611 | ||
613 | if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) | 612 | if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) |
614 | return 0; | 613 | return 0; |
@@ -636,10 +635,8 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter, | |||
636 | if (i == 10) { | 635 | if (i == 10) { |
637 | printk(KERN_ERR "%s: cannot set Mac addr for %s\n", | 636 | printk(KERN_ERR "%s: cannot set Mac addr for %s\n", |
638 | netxen_nic_driver_name, adapter->netdev->name); | 637 | netxen_nic_driver_name, adapter->netdev->name); |
639 | printk(KERN_ERR "MAC address set: %s.\n", | 638 | printk(KERN_ERR "MAC address set: %pM.\n", addr); |
640 | print_mac(mac, addr)); | 639 | printk(KERN_ERR "MAC address get: %pM.\n", mac_addr); |
641 | printk(KERN_ERR "MAC address get: %s.\n", | ||
642 | print_mac(mac, mac_addr)); | ||
643 | } | 640 | } |
644 | return 0; | 641 | return 0; |
645 | } | 642 | } |