aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-10-03 20:59:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:42 -0400
commit0795af5729b18218767fab27c44b1384f72dc9ad (patch)
tree67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/e1000
parent95ea36275f3c9a1d3d04c217b4b576c657c4e70e (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/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 7befb706ad55..ad444c9a5d04 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -872,6 +872,8 @@ e1000_probe(struct pci_dev *pdev,
872 int i, err, pci_using_dac; 872 int i, err, pci_using_dac;
873 uint16_t eeprom_data = 0; 873 uint16_t eeprom_data = 0;
874 uint16_t eeprom_apme_mask = E1000_EEPROM_APME; 874 uint16_t eeprom_apme_mask = E1000_EEPROM_APME;
875 DECLARE_MAC_BUF(mac);
876
875 if ((err = pci_enable_device(pdev))) 877 if ((err = pci_enable_device(pdev)))
876 return err; 878 return err;
877 879
@@ -1132,8 +1134,7 @@ e1000_probe(struct pci_dev *pdev,
1132 "32-bit")); 1134 "32-bit"));
1133 } 1135 }
1134 1136
1135 for (i = 0; i < 6; i++) 1137 printk("%s\n", print_mac(mac, netdev->dev_addr));
1136 printk("%2.2x%c", netdev->dev_addr[i], i == 5 ? '\n' : ':');
1137 1138
1138 /* reset the hardware with the new settings */ 1139 /* reset the hardware with the new settings */
1139 e1000_reset(adapter); 1140 e1000_reset(adapter);