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/ibm_emac | |
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/ibm_emac')
-rw-r--r-- | drivers/net/ibm_emac/ibm_emac_core.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c index d7da56b105cb..7d4fa7644e4b 100644 --- a/drivers/net/ibm_emac/ibm_emac_core.c +++ b/drivers/net/ibm_emac/ibm_emac_core.c | |||
@@ -353,10 +353,9 @@ static void emac_hash_mc(struct ocp_enet_private *dev) | |||
353 | 353 | ||
354 | for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) { | 354 | for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) { |
355 | int bit; | 355 | int bit; |
356 | DBG2("%d: mc %02x:%02x:%02x:%02x:%02x:%02x" NL, | 356 | DECLARE_MAC_BUF(mac); |
357 | dev->def->index, | 357 | DBG2("%d: mc %s" NL, |
358 | dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2], | 358 | dev->def->index, print_mac(mac, dmi->dmi_addr)); |
359 | dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]); | ||
360 | 359 | ||
361 | bit = 63 - (ether_crc(ETH_ALEN, dmi->dmi_addr) >> 26); | 360 | bit = 63 - (ether_crc(ETH_ALEN, dmi->dmi_addr) >> 26); |
362 | gaht[bit >> 4] |= 0x8000 >> (bit & 0x0f); | 361 | gaht[bit >> 4] |= 0x8000 >> (bit & 0x0f); |
@@ -1940,6 +1939,7 @@ static int __init emac_probe(struct ocp_device *ocpdev) | |||
1940 | struct ocp_device *maldev; | 1939 | struct ocp_device *maldev; |
1941 | struct ocp_enet_private *dev; | 1940 | struct ocp_enet_private *dev; |
1942 | int err, i; | 1941 | int err, i; |
1942 | DECLARE_MAC_BUF(mac); | ||
1943 | 1943 | ||
1944 | DBG("%d: probe" NL, ocpdev->def->index); | 1944 | DBG("%d: probe" NL, ocpdev->def->index); |
1945 | 1945 | ||
@@ -2188,10 +2188,8 @@ static int __init emac_probe(struct ocp_device *ocpdev) | |||
2188 | 2188 | ||
2189 | ocp_set_drvdata(ocpdev, dev); | 2189 | ocp_set_drvdata(ocpdev, dev); |
2190 | 2190 | ||
2191 | printk("%s: emac%d, MAC %02x:%02x:%02x:%02x:%02x:%02x\n", | 2191 | printk("%s: emac%d, MAC %s\n", |
2192 | ndev->name, dev->def->index, | 2192 | ndev->name, dev->def->index, print_mac(mac, ndev->dev_addr)); |
2193 | ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2], | ||
2194 | ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]); | ||
2195 | 2193 | ||
2196 | if (dev->phy.address >= 0) | 2194 | if (dev->phy.address >= 0) |
2197 | printk("%s: found %s PHY (0x%02x)\n", ndev->name, | 2195 | printk("%s: found %s PHY (0x%02x)\n", ndev->name, |