Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c
index bc74db0d12f3..6b1b7cea7f6b 100644
--- a/drivers/net/sunvnet.c
+++ b/drivers/net/sunvnet.c
@@ -765,7 +765,7 @@ static void __update_mc_list(struct vnet *vp, struct net_device *dev)
 {
         struct dev_addr_list *p;
 
-        for (p = dev->mc_list; p; p = p->next) {
+        netdev_for_each_mc_addr(p, dev) {
                 struct vnet_mcast_entry *m;
 
                 m = __vnet_mc_find(vp, p->dmi_addr);
@@ -1062,10 +1062,7 @@ static struct vnet * __devinit vnet_new(const u64 *local_mac)
                 goto err_out_free_dev;
         }
 
-        printk(KERN_INFO "%s: Sun LDOM vnet ", dev->name);
-
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
+        printk(KERN_INFO "%s: Sun LDOM vnet %pM\n", dev->name, dev->dev_addr);
 
         list_add(&vp->list, &vnet_list);