Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[powerpc.git] / drivers / usb / net / net1080.c

diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c
index 301baa7..19bf8da 100644 (file)
--- a/drivers/usb/net/net1080.c
+++ b/drivers/usb/net/net1080.c
@@ -21,7 +21,6 @@
 // #define     VERBOSE                 // more; success messages
 
 #include <linux/module.h>
-#include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -237,12 +236,12 @@ static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)
 #define        STATUS_CONN_OTHER       (1 << 14)
 #define        STATUS_SUSPEND_OTHER    (1 << 13)
 #define        STATUS_MAILBOX_OTHER    (1 << 12)
-#define        STATUS_PACKETS_OTHER(n) (((n) >> 8) && 0x03)
+#define        STATUS_PACKETS_OTHER(n) (((n) >> 8) & 0x03)
 
 #define        STATUS_CONN_THIS        (1 << 6)
 #define        STATUS_SUSPEND_THIS     (1 << 5)
 #define        STATUS_MAILBOX_THIS     (1 << 4)
-#define        STATUS_PACKETS_THIS(n)  (((n) >> 0) && 0x03)
+#define        STATUS_PACKETS_THIS(n)  (((n) >> 0) & 0x03)
 
 #define        STATUS_UNSPEC_MASK      0x0c8c
 #define        STATUS_NOISE_MASK       ((u16)~(0x0303|STATUS_UNSPEC_MASK))
@@ -368,7 +367,7 @@ static int net1080_check_connect(struct usbnet *dev)
        return 0;
 }
 
-static void nc_flush_complete(struct urb *urb, struct pt_regs *regs)
+static void nc_flush_complete(struct urb *urb)
 {
        kfree(urb->context);
        usb_free_urb(urb);
@@ -383,7 +382,7 @@ static void nc_ensure_sync(struct usbnet *dev)
                int                     status;
 
                /* Send a flush */
-               urb = usb_alloc_urb(0, SLAB_ATOMIC);
+               urb = usb_alloc_urb(0, GFP_ATOMIC);
                if (!urb)
                        return;
 
@@ -521,7 +520,7 @@ net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
                        skb->data = memmove(skb->head
                                                + sizeof (struct nc_header),
                                            skb->data, skb->len);
-                       skb->tail = skb->data + len;
+                       skb_set_tail_pointer(skb, len);
                        goto encapsulate;
                }
        }