- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / sunvnet.c

diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c
index ff1028a..6415ce1 100644 (file)
--- a/drivers/net/sunvnet.c
+++ b/drivers/net/sunvnet.c
@@ -1130,7 +1130,7 @@ static struct vio_driver_ops vnet_vio_ops = {
        .handshake_complete     = vnet_handshake_complete,
 };
 
-static void print_version(void)
+static void __devinit print_version(void)
 {
        static int version_printed;
 
@@ -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);