diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/s2io.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff) |
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index a285dd734a03..26895de3e264 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -7417,6 +7417,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) | |||
7417 | struct config_param *config; | 7417 | struct config_param *config; |
7418 | int mode; | 7418 | int mode; |
7419 | u8 dev_intr_type = intr_type; | 7419 | u8 dev_intr_type = intr_type; |
7420 | DECLARE_MAC_BUF(mac); | ||
7420 | 7421 | ||
7421 | if ((ret = s2io_verify_parm(pdev, &dev_intr_type))) | 7422 | if ((ret = s2io_verify_parm(pdev, &dev_intr_type))) |
7422 | return ret; | 7423 | return ret; |
@@ -7720,14 +7721,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) | |||
7720 | sp->product_name, pdev->revision); | 7721 | sp->product_name, pdev->revision); |
7721 | DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name, | 7722 | DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name, |
7722 | s2io_driver_version); | 7723 | s2io_driver_version); |
7723 | DBG_PRINT(ERR_DBG, "%s: MAC ADDR: " | 7724 | DBG_PRINT(ERR_DBG, "%s: MAC ADDR: %s\n", |
7724 | "%02x:%02x:%02x:%02x:%02x:%02x", dev->name, | 7725 | dev->name, print_mac(mac, dev->dev_addr)); |
7725 | sp->def_mac_addr[0].mac_addr[0], | ||
7726 | sp->def_mac_addr[0].mac_addr[1], | ||
7727 | sp->def_mac_addr[0].mac_addr[2], | ||
7728 | sp->def_mac_addr[0].mac_addr[3], | ||
7729 | sp->def_mac_addr[0].mac_addr[4], | ||
7730 | sp->def_mac_addr[0].mac_addr[5]); | ||
7731 | DBG_PRINT(ERR_DBG, "SERIAL NUMBER: %s\n", sp->serial_num); | 7726 | DBG_PRINT(ERR_DBG, "SERIAL NUMBER: %s\n", sp->serial_num); |
7732 | if (sp->device_type & XFRAME_II_DEVICE) { | 7727 | if (sp->device_type & XFRAME_II_DEVICE) { |
7733 | mode = s2io_print_pci_mode(sp); | 7728 | mode = s2io_print_pci_mode(sp); |