net: use netdev_mc_count and netdev_mc_empty when appropriate

[net-next-2.6.git] / drivers / net / usb / catc.c

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 22b87e64a810ccaa7c55fff97fd9ad3ae9be378a..5a13660ebd17814cd5af445986987b7f8e45b403 100644 (file)
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -648,7 +648,9 @@ static void catc_set_multicast_list(struct net_device *netdev)
        if (netdev->flags & IFF_ALLMULTI) {
                memset(catc->multicast, 0xff, 64);
        } else {
-               for (i = 0, mc = netdev->mc_list; mc && i < netdev->mc_count; i++, mc = mc->next) {
+               for (i = 0, mc = netdev->mc_list;
+                    mc && i < netdev_mc_count(netdev);
+                    i++, mc = mc->next) {
                        u32 crc = ether_crc_le(6, mc->dmi_addr);
                        if (!catc->is_f5u011) {
                                catc->multicast[(crc >> 3) & 0x3f] |= 1 << (crc & 7);
@@ -897,11 +899,9 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
                f5u011_rxmode(catc, catc->rxmode);
        }
        dbg("Init done.");
-       printk(KERN_INFO "%s: %s USB Ethernet at usb-%s-%s, ",
+       printk(KERN_INFO "%s: %s USB Ethernet at usb-%s-%s, %pM.\n",
               netdev->name, (catc->is_f5u011) ? "Belkin F5U011" : "CATC EL1210A NetMate",
-              usbdev->bus->bus_name, usbdev->devpath);
-       for (i = 0; i < 5; i++) printk("%2.2x:", netdev->dev_addr[i]);
-       printk("%2.2x.\n", netdev->dev_addr[i]);
+              usbdev->bus->bus_name, usbdev->devpath, netdev->dev_addr);
        usb_set_intfdata(intf, catc);
 
        SET_NETDEV_DEV(netdev, &intf->dev);