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

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 2bed6b087d16..602e123b2741 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -36,7 +36,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
@@ -44,6 +43,7 @@
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
 #include <linux/bitops.h>
+#include <linux/gfp.h>
 #include <asm/uaccess.h>
 
 #undef DEBUG
@@ -436,8 +436,8 @@ static netdev_tx_t catc_start_xmit(struct sk_buff *skb,
                         clear_bit(TX_RUNNING, &catc->flags);
         }
 
-        if ((catc->is_f5u011 && catc->tx_ptr)
-             || (catc->tx_ptr >= ((TX_MAX_BURST - 1) * (PKT_SZ + 2))))
+        if ((catc->is_f5u011 && catc->tx_ptr) ||
+            (catc->tx_ptr >= ((TX_MAX_BURST - 1) * (PKT_SZ + 2))))
                 netif_stop_queue(netdev);
 
         spin_unlock_irqrestore(&catc->tx_lock, flags);
@@ -632,7 +632,6 @@ static void catc_set_multicast_list(struct net_device *netdev)
         struct dev_mc_list *mc;
         u8 broadcast[6];
         u8 rx = RxEnable | RxPolarity | RxMultiCast;
-        int i;
 
         memset(broadcast, 0xff, 6);
         memset(catc->multicast, 0, 64);
@@ -648,7 +647,7 @@ 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) {
+                netdev_for_each_mc_addr(mc, netdev) {
                         u32 crc = ether_crc_le(6, mc->dmi_addr);
                         if (!catc->is_f5u011) {
                                 catc->multicast[(crc >> 3) & 0x3f] |= 1 << (crc & 7);
@@ -897,11 +896,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);