diff options
| author | Eugene Konev <ejka@imfi.kspu.ru> | 2007-10-24 06:42:01 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-25 11:31:14 +0400 |
| commit | df523b5cd9950485350fb1b7d97d5b8882d94a4e (patch) | |
| tree | e52ca91ee1495f727f4e4317e570f6ec185b1eca /drivers/net/cpmac.c | |
| parent | bbbab5ca835fb7676434815a47add8f2c696bec7 (diff) | |
| download | linux-df523b5cd9950485350fb1b7d97d5b8882d94a4e.tar.xz | |
cpmac: use print_mac() instead of MAC_FMT
Switch to using DECLARE_MAC_BUF/print_mac() added by commit
0795af5729b18218767fab27c44b1384f72dc9ad [NET]: Introduce and use print_mac()
and DECLARE_MAC_BUF().
Signed-off-by: Eugene Konev <ejka@imfi.kspu.ru>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/cpmac.c')
| -rw-r--r-- | drivers/net/cpmac.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 57541d2d9e1e..0598d4d438f5 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c @@ -53,12 +53,6 @@ MODULE_PARM_DESC(debug_level, "Number of NETIF_MSG bits to enable"); MODULE_PARM_DESC(dumb_switch, "Assume switch is not connected to MDIO bus"); #define CPMAC_VERSION "0.5.0" -/* stolen from net/ieee80211.h */ -#ifndef MAC_FMT -#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" -#define MAC_ARG(x) ((u8*)(x))[0], ((u8*)(x))[1], ((u8*)(x))[2], \ - ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5] -#endif /* frame size + 802.1q tag */ #define CPMAC_SKB_SIZE (ETH_FRAME_LEN + 4) #define CPMAC_QUEUES 8 @@ -1006,6 +1000,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) struct cpmac_priv *priv; struct net_device *dev; struct plat_cpmac_data *pdata; + DECLARE_MAC_BUF(mac); pdata = pdev->dev.platform_data; @@ -1077,9 +1072,9 @@ static int __devinit cpmac_probe(struct platform_device *pdev) if (netif_msg_probe(priv)) { printk(KERN_INFO - "cpmac: device %s (regs: %p, irq: %d, phy: %s, mac: " - MAC_FMT ")\n", dev->name, (void *)mem->start, dev->irq, - priv->phy_name, MAC_ARG(dev->dev_addr)); + "cpmac: device %s (regs: %p, irq: %d, phy: %s, " + "mac: %s)\n", dev->name, (void *)mem->start, dev->irq, + priv->phy_name, print_mac(mac, dev->dev_addr)); } return 0; |