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 a774105..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>
@@ -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;
                }
        }