diff options
| author |   Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/net/sunvnet.c | |
| parent | Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| download | linux-dev-bd45ac0c5daae35e7c71138172e63df5cf644cf6.tar.xz linux-dev-bd45ac0c5daae35e7c71138172e63df5cf644cf6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/sunvnet.c')
| -rw-r--r-- | drivers/net/sunvnet.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c index ff1028a597df..4a0035f7a842 100644 --- a/drivers/net/sunvnet.c +++ b/drivers/net/sunvnet.c @@ -1149,6 +1149,7 @@ static int __devinit vnet_port_probe(struct vio_dev *vdev, struct vnet *vp; const u64 *rmac; int len, i, err, switch_port; + DECLARE_MAC_BUF(mac); print_version(); @@ -1213,12 +1214,9 @@ static int __devinit vnet_port_probe(struct vio_dev *vdev, dev_set_drvdata(&vdev->dev, port); - printk(KERN_INFO "%s: PORT ( remote-mac ", vp->dev->name); - for (i = 0; i < 6; i++) - printk("%2.2x%c", port->raddr[i], i == 5 ? ' ' : ':'); - if (switch_port) - printk("switch-port "); - printk(")\n"); + printk(KERN_INFO "%s: PORT ( remote-mac %s%s )\n", + vp->dev->name, print_mac(mac, port->raddr), + switch_port ? " switch-port" : ""); vio_port_up(&port->vio); |