1.1 --- a/buildconfigs/mk.linux-2.6-xen	Tue Nov 28 14:27:13 2006 +0000
     1.2 +++ b/buildconfigs/mk.linux-2.6-xen	Tue Nov 28 15:25:26 2006 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  LINUX_SERIES = 2.6
     1.5 -LINUX_VER    = 2.6.16.32
     1.6 +LINUX_VER    = 2.6.16.33
     1.7  
     1.8  EXTRAVERSION ?= xen
     1.9  

     2.1 --- a/patches/linux-2.6.16.32/blktap-aio-16_03_06.patch	Tue Nov 28 14:27:13 2006 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,294 +0,0 @@
     2.4 -diff -pruN ../orig-linux-2.6.16.29/fs/aio.c ./fs/aio.c
     2.5 ---- ../orig-linux-2.6.16.29/fs/aio.c	2006-09-12 19:02:10.000000000 +0100
     2.6 -+++ ./fs/aio.c	2006-09-19 13:58:49.000000000 +0100
     2.7 -@@ -34,6 +34,11 @@
     2.8 - #include <asm/uaccess.h>
     2.9 - #include <asm/mmu_context.h>
    2.10 - 
    2.11 -+#ifdef CONFIG_EPOLL
    2.12 -+#include <linux/poll.h>
    2.13 -+#include <linux/eventpoll.h>
    2.14 -+#endif
    2.15 -+
    2.16 - #if DEBUG > 1
    2.17 - #define dprintk		printk
    2.18 - #else
    2.19 -@@ -1016,6 +1021,10 @@ put_rq:
    2.20 - 	if (waitqueue_active(&ctx->wait))
    2.21 - 		wake_up(&ctx->wait);
    2.22 - 
    2.23 -+#ifdef CONFIG_EPOLL
    2.24 -+	if (ctx->file && waitqueue_active(&ctx->poll_wait))
    2.25 -+		wake_up(&ctx->poll_wait);
    2.26 -+#endif
    2.27 - 	if (ret)
    2.28 - 		put_ioctx(ctx);
    2.29 - 
    2.30 -@@ -1025,6 +1034,8 @@ put_rq:
    2.31 - /* aio_read_evt
    2.32 -  *	Pull an event off of the ioctx's event ring.  Returns the number of 
    2.33 -  *	events fetched (0 or 1 ;-)
    2.34 -+ *	If ent parameter is 0, just returns the number of events that would
    2.35 -+ *	be fetched.
    2.36 -  *	FIXME: make this use cmpxchg.
    2.37 -  *	TODO: make the ringbuffer user mmap()able (requires FIXME).
    2.38 -  */
    2.39 -@@ -1047,13 +1058,18 @@ static int aio_read_evt(struct kioctx *i
    2.40 - 
    2.41 - 	head = ring->head % info->nr;
    2.42 - 	if (head != ring->tail) {
    2.43 --		struct io_event *evp = aio_ring_event(info, head, KM_USER1);
    2.44 --		*ent = *evp;
    2.45 --		head = (head + 1) % info->nr;
    2.46 --		smp_mb(); /* finish reading the event before updatng the head */
    2.47 --		ring->head = head;
    2.48 --		ret = 1;
    2.49 --		put_aio_ring_event(evp, KM_USER1);
    2.50 -+		if (ent) { /* event requested */
    2.51 -+			struct io_event *evp =
    2.52 -+				aio_ring_event(info, head, KM_USER1);
    2.53 -+			*ent = *evp;
    2.54 -+			head = (head + 1) % info->nr;
    2.55 -+			/* finish reading the event before updatng the head */
    2.56 -+			smp_mb();
    2.57 -+			ring->head = head;
    2.58 -+			ret = 1;
    2.59 -+			put_aio_ring_event(evp, KM_USER1);
    2.60 -+		} else /* only need to know availability */
    2.61 -+			ret = 1;
    2.62 - 	}
    2.63 - 	spin_unlock(&info->ring_lock);
    2.64 - 
    2.65 -@@ -1236,9 +1252,78 @@ static void io_destroy(struct kioctx *io
    2.66 - 
    2.67 - 	aio_cancel_all(ioctx);
    2.68 - 	wait_for_all_aios(ioctx);
    2.69 -+#ifdef CONFIG_EPOLL
    2.70 -+	/* forget the poll file, but it's up to the user to close it */
    2.71 -+	if (ioctx->file) {
    2.72 -+		ioctx->file->private_data = 0;
    2.73 -+		ioctx->file = 0;
    2.74 -+	}
    2.75 -+#endif
    2.76 - 	put_ioctx(ioctx);	/* once for the lookup */
    2.77 - }
    2.78 - 
    2.79 -+#ifdef CONFIG_EPOLL
    2.80 -+
    2.81 -+static int aio_queue_fd_close(struct inode *inode, struct file *file)
    2.82 -+{
    2.83 -+	struct kioctx *ioctx = file->private_data;
    2.84 -+	if (ioctx) {
    2.85 -+		file->private_data = 0;
    2.86 -+		spin_lock_irq(&ioctx->ctx_lock);
    2.87 -+		ioctx->file = 0;
    2.88 -+		spin_unlock_irq(&ioctx->ctx_lock);
    2.89 -+	}
    2.90 -+	return 0;
    2.91 -+}
    2.92 -+
    2.93 -+static unsigned int aio_queue_fd_poll(struct file *file, poll_table *wait)
    2.94 -+{	unsigned int pollflags = 0;
    2.95 -+	struct kioctx *ioctx = file->private_data;
    2.96 -+
    2.97 -+	if (ioctx) {
    2.98 -+
    2.99 -+		spin_lock_irq(&ioctx->ctx_lock);
   2.100 -+		/* Insert inside our poll wait queue */
   2.101 -+		poll_wait(file, &ioctx->poll_wait, wait);
   2.102 -+
   2.103 -+		/* Check our condition */
   2.104 -+		if (aio_read_evt(ioctx, 0))
   2.105 -+			pollflags = POLLIN | POLLRDNORM;
   2.106 -+		spin_unlock_irq(&ioctx->ctx_lock);
   2.107 -+	}
   2.108 -+
   2.109 -+	return pollflags;
   2.110 -+}
   2.111 -+
   2.112 -+static struct file_operations aioq_fops = {
   2.113 -+	.release	= aio_queue_fd_close,
   2.114 -+	.poll		= aio_queue_fd_poll
   2.115 -+};
   2.116 -+
   2.117 -+/* make_aio_fd:
   2.118 -+ *  Create a file descriptor that can be used to poll the event queue.
   2.119 -+ *  Based and piggybacked on the excellent epoll code.
   2.120 -+ */
   2.121 -+
   2.122 -+static int make_aio_fd(struct kioctx *ioctx)
   2.123 -+{
   2.124 -+	int error, fd;
   2.125 -+	struct inode *inode;
   2.126 -+	struct file *file;
   2.127 -+
   2.128 -+	error = ep_getfd(&fd, &inode, &file, NULL, &aioq_fops);
   2.129 -+	if (error)
   2.130 -+		return error;
   2.131 -+
   2.132 -+	/* associate the file with the IO context */
   2.133 -+	file->private_data = ioctx;
   2.134 -+	ioctx->file = file;
   2.135 -+	init_waitqueue_head(&ioctx->poll_wait);
   2.136 -+	return fd;
   2.137 -+}
   2.138 -+#endif
   2.139 -+
   2.140 -+
   2.141 - /* sys_io_setup:
   2.142 -  *	Create an aio_context capable of receiving at least nr_events.
   2.143 -  *	ctxp must not point to an aio_context that already exists, and
   2.144 -@@ -1251,18 +1336,30 @@ static void io_destroy(struct kioctx *io
   2.145 -  *	resources are available.  May fail with -EFAULT if an invalid
   2.146 -  *	pointer is passed for ctxp.  Will fail with -ENOSYS if not
   2.147 -  *	implemented.
   2.148 -+ *
   2.149 -+ *	To request a selectable fd, the user context has to be initialized
   2.150 -+ *	to 1, instead of 0, and the return value is the fd.
   2.151 -+ *	This keeps the system call compatible, since a non-zero value
   2.152 -+ *	was not allowed so far.
   2.153 -  */
   2.154 - asmlinkage long sys_io_setup(unsigned nr_events, aio_context_t __user *ctxp)
   2.155 - {
   2.156 - 	struct kioctx *ioctx = NULL;
   2.157 - 	unsigned long ctx;
   2.158 - 	long ret;
   2.159 -+	int make_fd = 0;
   2.160 - 
   2.161 - 	ret = get_user(ctx, ctxp);
   2.162 - 	if (unlikely(ret))
   2.163 - 		goto out;
   2.164 - 
   2.165 - 	ret = -EINVAL;
   2.166 -+#ifdef CONFIG_EPOLL
   2.167 -+	if (ctx == 1) {
   2.168 -+		make_fd = 1;
   2.169 -+		ctx = 0;
   2.170 -+	}
   2.171 -+#endif
   2.172 - 	if (unlikely(ctx || nr_events == 0)) {
   2.173 - 		pr_debug("EINVAL: io_setup: ctx %lu nr_events %u\n",
   2.174 - 		         ctx, nr_events);
   2.175 -@@ -1273,8 +1370,12 @@ asmlinkage long sys_io_setup(unsigned nr
   2.176 - 	ret = PTR_ERR(ioctx);
   2.177 - 	if (!IS_ERR(ioctx)) {
   2.178 - 		ret = put_user(ioctx->user_id, ctxp);
   2.179 --		if (!ret)
   2.180 --			return 0;
   2.181 -+#ifdef CONFIG_EPOLL
   2.182 -+		if (make_fd && ret >= 0)
   2.183 -+			ret = make_aio_fd(ioctx);
   2.184 -+#endif
   2.185 -+		if (ret >= 0)
   2.186 -+			return ret;
   2.187 - 
   2.188 - 		get_ioctx(ioctx); /* io_destroy() expects us to hold a ref */
   2.189 - 		io_destroy(ioctx);
   2.190 -diff -pruN ../orig-linux-2.6.16.29/fs/eventpoll.c ./fs/eventpoll.c
   2.191 ---- ../orig-linux-2.6.16.29/fs/eventpoll.c	2006-09-12 19:02:10.000000000 +0100
   2.192 -+++ ./fs/eventpoll.c	2006-09-19 13:58:49.000000000 +0100
   2.193 -@@ -235,8 +235,6 @@ struct ep_pqueue {
   2.194 - 
   2.195 - static void ep_poll_safewake_init(struct poll_safewake *psw);
   2.196 - static void ep_poll_safewake(struct poll_safewake *psw, wait_queue_head_t *wq);
   2.197 --static int ep_getfd(int *efd, struct inode **einode, struct file **efile,
   2.198 --		    struct eventpoll *ep);
   2.199 - static int ep_alloc(struct eventpoll **pep);
   2.200 - static void ep_free(struct eventpoll *ep);
   2.201 - static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd);
   2.202 -@@ -266,7 +264,7 @@ static int ep_events_transfer(struct eve
   2.203 - static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
   2.204 - 		   int maxevents, long timeout);
   2.205 - static int eventpollfs_delete_dentry(struct dentry *dentry);
   2.206 --static struct inode *ep_eventpoll_inode(void);
   2.207 -+static struct inode *ep_eventpoll_inode(struct file_operations *fops);
   2.208 - static struct super_block *eventpollfs_get_sb(struct file_system_type *fs_type,
   2.209 - 					      int flags, const char *dev_name,
   2.210 - 					      void *data);
   2.211 -@@ -525,7 +523,7 @@ asmlinkage long sys_epoll_create(int siz
   2.212 - 	 * Creates all the items needed to setup an eventpoll file. That is,
   2.213 - 	 * a file structure, and inode and a free file descriptor.
   2.214 - 	 */
   2.215 --	error = ep_getfd(&fd, &inode, &file, ep);
   2.216 -+	error = ep_getfd(&fd, &inode, &file, ep, &eventpoll_fops);
   2.217 - 	if (error)
   2.218 - 		goto eexit_2;
   2.219 - 
   2.220 -@@ -710,8 +708,8 @@ eexit_1:
   2.221 - /*
   2.222 -  * Creates the file descriptor to be used by the epoll interface.
   2.223 -  */
   2.224 --static int ep_getfd(int *efd, struct inode **einode, struct file **efile,
   2.225 --		    struct eventpoll *ep)
   2.226 -+int ep_getfd(int *efd, struct inode **einode, struct file **efile,
   2.227 -+		    struct eventpoll *ep, struct file_operations *fops)
   2.228 - {
   2.229 - 	struct qstr this;
   2.230 - 	char name[32];
   2.231 -@@ -727,7 +725,7 @@ static int ep_getfd(int *efd, struct ino
   2.232 - 		goto eexit_1;
   2.233 - 
   2.234 - 	/* Allocates an inode from the eventpoll file system */
   2.235 --	inode = ep_eventpoll_inode();
   2.236 -+	inode = ep_eventpoll_inode(fops);
   2.237 - 	error = PTR_ERR(inode);
   2.238 - 	if (IS_ERR(inode))
   2.239 - 		goto eexit_2;
   2.240 -@@ -758,7 +756,7 @@ static int ep_getfd(int *efd, struct ino
   2.241 - 
   2.242 - 	file->f_pos = 0;
   2.243 - 	file->f_flags = O_RDONLY;
   2.244 --	file->f_op = &eventpoll_fops;
   2.245 -+	file->f_op = fops;
   2.246 - 	file->f_mode = FMODE_READ;
   2.247 - 	file->f_version = 0;
   2.248 - 	file->private_data = ep;
   2.249 -@@ -1574,7 +1572,7 @@ static int eventpollfs_delete_dentry(str
   2.250 - }
   2.251 - 
   2.252 - 
   2.253 --static struct inode *ep_eventpoll_inode(void)
   2.254 -+static struct inode *ep_eventpoll_inode(struct file_operations *fops)
   2.255 - {
   2.256 - 	int error = -ENOMEM;
   2.257 - 	struct inode *inode = new_inode(eventpoll_mnt->mnt_sb);
   2.258 -@@ -1582,7 +1580,7 @@ static struct inode *ep_eventpoll_inode(
   2.259 - 	if (!inode)
   2.260 - 		goto eexit_1;
   2.261 - 
   2.262 --	inode->i_fop = &eventpoll_fops;
   2.263 -+	inode->i_fop = fops;
   2.264 - 
   2.265 - 	/*
   2.266 - 	 * Mark the inode dirty from the very beginning,
   2.267 -diff -pruN ../orig-linux-2.6.16.29/include/linux/aio.h ./include/linux/aio.h
   2.268 ---- ../orig-linux-2.6.16.29/include/linux/aio.h	2006-09-12 19:02:10.000000000 +0100
   2.269 -+++ ./include/linux/aio.h	2006-09-19 13:58:49.000000000 +0100
   2.270 -@@ -191,6 +191,11 @@ struct kioctx {
   2.271 - 	struct aio_ring_info	ring_info;
   2.272 - 
   2.273 - 	struct work_struct	wq;
   2.274 -+#ifdef CONFIG_EPOLL
   2.275 -+	// poll integration
   2.276 -+	wait_queue_head_t       poll_wait;
   2.277 -+	struct file		*file;
   2.278 -+#endif
   2.279 - };
   2.280 - 
   2.281 - /* prototypes */
   2.282 -diff -pruN ../orig-linux-2.6.16.29/include/linux/eventpoll.h ./include/linux/eventpoll.h
   2.283 ---- ../orig-linux-2.6.16.29/include/linux/eventpoll.h	2006-09-12 19:02:10.000000000 +0100
   2.284 -+++ ./include/linux/eventpoll.h	2006-09-19 13:58:49.000000000 +0100
   2.285 -@@ -86,6 +86,12 @@ static inline void eventpoll_release(str
   2.286 - }
   2.287 - 
   2.288 - 
   2.289 -+/*
   2.290 -+ * called by aio code to create fd that can poll the  aio event queueQ
   2.291 -+ */
   2.292 -+struct eventpoll;
   2.293 -+int ep_getfd(int *efd, struct inode **einode, struct file **efile,
   2.294 -+             struct eventpoll *ep, struct file_operations *fops);
   2.295 - #else
   2.296 - 
   2.297 - static inline void eventpoll_init_file(struct file *file) {}

     3.1 --- a/patches/linux-2.6.16.32/device_bind.patch	Tue Nov 28 14:27:13 2006 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,15 +0,0 @@
     3.4 -diff -pruN ../orig-linux-2.6.16.29/drivers/base/bus.c ./drivers/base/bus.c
     3.5 ---- ../orig-linux-2.6.16.29/drivers/base/bus.c	2006-09-12 19:02:10.000000000 +0100
     3.6 -+++ ./drivers/base/bus.c	2006-09-19 13:58:54.000000000 +0100
     3.7 -@@ -188,6 +188,11 @@ static ssize_t driver_bind(struct device
     3.8 - 		up(&dev->sem);
     3.9 - 		if (dev->parent)
    3.10 - 			up(&dev->parent->sem);
    3.11 -+
    3.12 -+		if (err > 0) 		/* success */
    3.13 -+			err = count;
    3.14 -+		else if (err == 0)	/* driver didn't accept device */
    3.15 -+			err = -ENODEV;
    3.16 - 	}
    3.17 - 	put_device(dev);
    3.18 - 	put_bus(bus);

     4.1 --- a/patches/linux-2.6.16.32/fix-hz-suspend.patch	Tue Nov 28 14:27:13 2006 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,26 +0,0 @@
     4.4 -diff -pruN ../orig-linux-2.6.16.29/kernel/timer.c ./kernel/timer.c
     4.5 ---- ../orig-linux-2.6.16.29/kernel/timer.c	2006-09-12 19:02:10.000000000 +0100
     4.6 -+++ ./kernel/timer.c	2006-09-19 13:58:58.000000000 +0100
     4.7 -@@ -555,6 +555,22 @@ found:
     4.8 - 	}
     4.9 - 	spin_unlock(&base->t_base.lock);
    4.10 - 
    4.11 -+	/*
    4.12 -+	 * It can happen that other CPUs service timer IRQs and increment
    4.13 -+	 * jiffies, but we have not yet got a local timer tick to process
    4.14 -+	 * the timer wheels.  In that case, the expiry time can be before
    4.15 -+	 * jiffies, but since the high-resolution timer here is relative to
    4.16 -+	 * jiffies, the default expression when high-resolution timers are
    4.17 -+	 * not active,
    4.18 -+	 *
    4.19 -+	 *   time_before(MAX_JIFFY_OFFSET + jiffies, expires)
    4.20 -+	 *
    4.21 -+	 * would falsely evaluate to true.  If that is the case, just
    4.22 -+	 * return jiffies so that we can immediately fire the local timer
    4.23 -+	 */
    4.24 -+	if (time_before(expires, jiffies))
    4.25 -+		return jiffies;
    4.26 -+
    4.27 - 	if (time_before(hr_expires, expires))
    4.28 - 		return hr_expires;
    4.29 - 

     5.1 --- a/patches/linux-2.6.16.32/fix-ide-cd-pio-mode.patch	Tue Nov 28 14:27:13 2006 +0000
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,18 +0,0 @@
     5.4 -diff -pruN ../orig-linux-2.6.16.29/drivers/ide/ide-lib.c ./drivers/ide/ide-lib.c
     5.5 ---- ../orig-linux-2.6.16.29/drivers/ide/ide-lib.c	2006-09-12 19:02:10.000000000 +0100
     5.6 -+++ ./drivers/ide/ide-lib.c	2006-09-19 13:59:03.000000000 +0100
     5.7 -@@ -410,10 +410,10 @@ void ide_toggle_bounce(ide_drive_t *driv
     5.8 - {
     5.9 - 	u64 addr = BLK_BOUNCE_HIGH;	/* dma64_addr_t */
    5.10 - 
    5.11 --	if (!PCI_DMA_BUS_IS_PHYS) {
    5.12 --		addr = BLK_BOUNCE_ANY;
    5.13 --	} else if (on && drive->media == ide_disk) {
    5.14 --		if (HWIF(drive)->pci_dev)
    5.15 -+	if (on && drive->media == ide_disk) {
    5.16 -+		if (!PCI_DMA_BUS_IS_PHYS)
    5.17 -+			addr = BLK_BOUNCE_ANY;
    5.18 -+		else if (HWIF(drive)->pci_dev)
    5.19 - 			addr = HWIF(drive)->pci_dev->dma_mask;
    5.20 - 	}
    5.21 - 

     6.1 --- a/patches/linux-2.6.16.32/i386-mach-io-check-nmi.patch	Tue Nov 28 14:27:13 2006 +0000
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,45 +0,0 @@
     6.4 -diff -pruN ../orig-linux-2.6.16.29/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c
     6.5 ---- ../orig-linux-2.6.16.29/arch/i386/kernel/traps.c	2006-09-12 19:02:10.000000000 +0100
     6.6 -+++ ./arch/i386/kernel/traps.c	2006-09-19 13:59:06.000000000 +0100
     6.7 -@@ -567,18 +567,11 @@ static void mem_parity_error(unsigned ch
     6.8 - 
     6.9 - static void io_check_error(unsigned char reason, struct pt_regs * regs)
    6.10 - {
    6.11 --	unsigned long i;
    6.12 --
    6.13 - 	printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n");
    6.14 - 	show_registers(regs);
    6.15 - 
    6.16 - 	/* Re-enable the IOCK line, wait for a few seconds */
    6.17 --	reason = (reason & 0xf) | 8;
    6.18 --	outb(reason, 0x61);
    6.19 --	i = 2000;
    6.20 --	while (--i) udelay(1000);
    6.21 --	reason &= ~8;
    6.22 --	outb(reason, 0x61);
    6.23 -+	clear_io_check_error(reason);
    6.24 - }
    6.25 - 
    6.26 - static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
    6.27 -diff -pruN ../orig-linux-2.6.16.29/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h
    6.28 ---- ../orig-linux-2.6.16.29/include/asm-i386/mach-default/mach_traps.h	2006-09-12 19:02:10.000000000 +0100
    6.29 -+++ ./include/asm-i386/mach-default/mach_traps.h	2006-09-19 13:59:06.000000000 +0100
    6.30 -@@ -15,6 +15,18 @@ static inline void clear_mem_error(unsig
    6.31 - 	outb(reason, 0x61);
    6.32 - }
    6.33 - 
    6.34 -+static inline void clear_io_check_error(unsigned char reason)
    6.35 -+{
    6.36 -+	unsigned long i;
    6.37 -+
    6.38 -+	reason = (reason & 0xf) | 8;
    6.39 -+	outb(reason, 0x61);
    6.40 -+	i = 2000;
    6.41 -+	while (--i) udelay(1000);
    6.42 -+	reason &= ~8;
    6.43 -+	outb(reason, 0x61);
    6.44 -+}
    6.45 -+
    6.46 - static inline unsigned char get_nmi_reason(void)
    6.47 - {
    6.48 - 	return inb(0x61);

     7.1 --- a/patches/linux-2.6.16.32/ipv6-no-autoconf.patch	Tue Nov 28 14:27:13 2006 +0000
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,19 +0,0 @@
     7.4 -diff -pruN ../orig-linux-2.6.16.29/net/ipv6/addrconf.c ./net/ipv6/addrconf.c
     7.5 ---- ../orig-linux-2.6.16.29/net/ipv6/addrconf.c	2006-09-12 19:02:10.000000000 +0100
     7.6 -+++ ./net/ipv6/addrconf.c	2006-09-19 13:59:11.000000000 +0100
     7.7 -@@ -2471,6 +2471,7 @@ static void addrconf_dad_start(struct in
     7.8 - 	spin_lock_bh(&ifp->lock);
     7.9 - 
    7.10 - 	if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
    7.11 -+	    !(dev->flags&IFF_MULTICAST) ||
    7.12 - 	    !(ifp->flags&IFA_F_TENTATIVE)) {
    7.13 - 		ifp->flags &= ~IFA_F_TENTATIVE;
    7.14 - 		spin_unlock_bh(&ifp->lock);
    7.15 -@@ -2555,6 +2556,7 @@ static void addrconf_dad_completed(struc
    7.16 - 	if (ifp->idev->cnf.forwarding == 0 &&
    7.17 - 	    ifp->idev->cnf.rtr_solicits > 0 &&
    7.18 - 	    (dev->flags&IFF_LOOPBACK) == 0 &&
    7.19 -+	    (dev->flags & IFF_MULTICAST) &&
    7.20 - 	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
    7.21 - 		struct in6_addr all_routers;
    7.22 - 

     8.1 --- a/patches/linux-2.6.16.32/kasprintf.patch	Tue Nov 28 14:27:13 2006 +0000
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,59 +0,0 @@
     8.4 -commit e905914f96e11862b130dd229f73045dad9a34e8
     8.5 -Author: Jeremy Fitzhardinge <jeremy@xensource.com>
     8.6 -Date:   Sun Jun 25 05:49:17 2006 -0700
     8.7 -
     8.8 -    [PATCH] Implement kasprintf
     8.9 -    
    8.10 -    Implement kasprintf, a kernel version of asprintf.  This allocates the
    8.11 -    memory required for the formatted string, including the trailing '\0'.
    8.12 -    Returns NULL on allocation failure.
    8.13 -    
    8.14 -    Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
    8.15 -    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    8.16 -    Signed-off-by: Andrew Morton <akpm@osdl.org>
    8.17 -    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    8.18 -
    8.19 -diff --git a/include/linux/kernel.h b/include/linux/kernel.h
    8.20 -index 8c21aaa..3c5e4c2 100644
    8.21 ---- a/include/linux/kernel.h
    8.22 -+++ b/include/linux/kernel.h
    8.23 -@@ -117,6 +117,8 @@ extern int scnprintf(char * buf, size_t
    8.24 - 	__attribute__ ((format (printf, 3, 4)));
    8.25 - extern int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
    8.26 - 	__attribute__ ((format (printf, 3, 0)));
    8.27 -+extern char *kasprintf(gfp_t gfp, const char *fmt, ...)
    8.28 -+	__attribute__ ((format (printf, 2, 3)));
    8.29 - 
    8.30 - extern int sscanf(const char *, const char *, ...)
    8.31 - 	__attribute__ ((format (scanf, 2, 3)));
    8.32 -diff --git a/lib/vsprintf.c b/lib/vsprintf.c
    8.33 -index f595947..797428a 100644
    8.34 ---- a/lib/vsprintf.c
    8.35 -+++ b/lib/vsprintf.c
    8.36 -@@ -849,3 +849,26 @@ int sscanf(const char * buf, const char
    8.37 - }
    8.38 - 
    8.39 - EXPORT_SYMBOL(sscanf);
    8.40 -+
    8.41 -+
    8.42 -+/* Simplified asprintf. */
    8.43 -+char *kasprintf(gfp_t gfp, const char *fmt, ...)
    8.44 -+{
    8.45 -+	va_list ap;
    8.46 -+	unsigned int len;
    8.47 -+	char *p;
    8.48 -+
    8.49 -+	va_start(ap, fmt);
    8.50 -+	len = vsnprintf(NULL, 0, fmt, ap);
    8.51 -+	va_end(ap);
    8.52 -+
    8.53 -+	p = kmalloc(len+1, gfp);
    8.54 -+	if (!p)
    8.55 -+		return NULL;
    8.56 -+	va_start(ap, fmt);
    8.57 -+	vsnprintf(p, len+1, fmt, ap);
    8.58 -+	va_end(ap);
    8.59 -+	return p;
    8.60 -+}
    8.61 -+
    8.62 -+EXPORT_SYMBOL(kasprintf);

     9.1 --- a/patches/linux-2.6.16.32/net-csum.patch	Tue Nov 28 14:27:13 2006 +0000
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,63 +0,0 @@
     9.4 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c
     9.5 ---- ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-09-12 19:02:10.000000000 +0100
     9.6 -+++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-09-19 13:59:15.000000000 +0100
     9.7 -@@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
     9.8 - 	if (hdrsize < sizeof(*hdr))
     9.9 - 		return 1;
    9.10 - 
    9.11 --	hdr->check = ip_nat_cheat_check(~oldip, newip,
    9.12 -+#ifdef CONFIG_XEN
    9.13 -+	if ((*pskb)->proto_csum_blank)
    9.14 -+		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
    9.15 -+	else
    9.16 -+#endif
    9.17 -+		hdr->check = ip_nat_cheat_check(~oldip, newip,
    9.18 - 					ip_nat_cheat_check(oldport ^ 0xFFFF,
    9.19 - 							   newport,
    9.20 - 							   hdr->check));
    9.21 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c
    9.22 ---- ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-09-12 19:02:10.000000000 +0100
    9.23 -+++ ./net/ipv4/netfilter/ip_nat_proto_udp.c	2006-09-19 13:59:15.000000000 +0100
    9.24 -@@ -113,11 +113,17 @@ udp_manip_pkt(struct sk_buff **pskb,
    9.25 - 		newport = tuple->dst.u.udp.port;
    9.26 - 		portptr = &hdr->dest;
    9.27 - 	}
    9.28 --	if (hdr->check) /* 0 is a special case meaning no checksum */
    9.29 --		hdr->check = ip_nat_cheat_check(~oldip, newip,
    9.30 -+	if (hdr->check) { /* 0 is a special case meaning no checksum */
    9.31 -+#ifdef CONFIG_XEN
    9.32 -+		if ((*pskb)->proto_csum_blank)
    9.33 -+			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
    9.34 -+		else
    9.35 -+#endif
    9.36 -+			hdr->check = ip_nat_cheat_check(~oldip, newip,
    9.37 - 					ip_nat_cheat_check(*portptr ^ 0xFFFF,
    9.38 - 							   newport,
    9.39 - 							   hdr->check));
    9.40 -+	}
    9.41 - 	*portptr = newport;
    9.42 - 	return 1;
    9.43 - }
    9.44 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c ./net/ipv4/xfrm4_output.c
    9.45 ---- ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c	2006-09-12 19:02:10.000000000 +0100
    9.46 -+++ ./net/ipv4/xfrm4_output.c	2006-09-19 13:59:15.000000000 +0100
    9.47 -@@ -17,6 +17,8 @@
    9.48 - #include <net/xfrm.h>
    9.49 - #include <net/icmp.h>
    9.50 - 
    9.51 -+extern int skb_checksum_setup(struct sk_buff *skb);
    9.52 -+
    9.53 - /* Add encapsulation header.
    9.54 -  *
    9.55 -  * In transport mode, the IP header will be moved forward to make space
    9.56 -@@ -103,6 +105,10 @@ static int xfrm4_output_one(struct sk_bu
    9.57 - 	struct xfrm_state *x = dst->xfrm;
    9.58 - 	int err;
    9.59 - 	
    9.60 -+	err = skb_checksum_setup(skb);
    9.61 -+	if (err)
    9.62 -+		goto error_nolock;
    9.63 -+
    9.64 - 	if (skb->ip_summed == CHECKSUM_HW) {
    9.65 - 		err = skb_checksum_help(skb, 0);
    9.66 - 		if (err)

    10.1 --- a/patches/linux-2.6.16.32/net-gso-0-base.patch	Tue Nov 28 14:27:13 2006 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,2898 +0,0 @@
    10.4 -Index: tmp-xxx/Documentation/networking/netdevices.txt
    10.5 -===================================================================
    10.6 ---- tmp-xxx.orig/Documentation/networking/netdevices.txt	2006-11-15 10:38:39.000000000 +0000
    10.7 -+++ tmp-xxx/Documentation/networking/netdevices.txt	2006-11-27 10:52:42.000000000 +0000
    10.8 -@@ -42,9 +42,9 @@
    10.9 - 	Context: nominally process, but don't sleep inside an rwlock
   10.10 - 
   10.11 - dev->hard_start_xmit:
   10.12 --	Synchronization: dev->xmit_lock spinlock.
   10.13 -+	Synchronization: netif_tx_lock spinlock.
   10.14 - 	When the driver sets NETIF_F_LLTX in dev->features this will be
   10.15 --	called without holding xmit_lock. In this case the driver 
   10.16 -+	called without holding netif_tx_lock. In this case the driver
   10.17 - 	has to lock by itself when needed. It is recommended to use a try lock
   10.18 - 	for this and return -1 when the spin lock fails. 
   10.19 - 	The locking there should also properly protect against 
   10.20 -@@ -62,12 +62,12 @@
   10.21 - 	  Only valid when NETIF_F_LLTX is set.
   10.22 - 
   10.23 - dev->tx_timeout:
   10.24 --	Synchronization: dev->xmit_lock spinlock.
   10.25 -+	Synchronization: netif_tx_lock spinlock.
   10.26 - 	Context: BHs disabled
   10.27 - 	Notes: netif_queue_stopped() is guaranteed true
   10.28 - 
   10.29 - dev->set_multicast_list:
   10.30 --	Synchronization: dev->xmit_lock spinlock.
   10.31 -+	Synchronization: netif_tx_lock spinlock.
   10.32 - 	Context: BHs disabled
   10.33 - 
   10.34 - dev->poll:
   10.35 -Index: tmp-xxx/drivers/block/aoe/aoenet.c
   10.36 -===================================================================
   10.37 ---- tmp-xxx.orig/drivers/block/aoe/aoenet.c	2006-11-15 10:38:39.000000000 +0000
   10.38 -+++ tmp-xxx/drivers/block/aoe/aoenet.c	2006-11-27 10:52:42.000000000 +0000
   10.39 -@@ -95,9 +95,8 @@
   10.40 - static struct sk_buff *
   10.41 - skb_check(struct sk_buff *skb)
   10.42 - {
   10.43 --	if (skb_is_nonlinear(skb))
   10.44 - 	if ((skb = skb_share_check(skb, GFP_ATOMIC)))
   10.45 --	if (skb_linearize(skb, GFP_ATOMIC) < 0) {
   10.46 -+	if (skb_linearize(skb)) {
   10.47 - 		dev_kfree_skb(skb);
   10.48 - 		return NULL;
   10.49 - 	}
   10.50 -Index: tmp-xxx/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
   10.51 -===================================================================
   10.52 ---- tmp-xxx.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c	2006-11-15 10:38:39.000000000 +0000
   10.53 -+++ tmp-xxx/drivers/infiniband/ulp/ipoib/ipoib_multicast.c	2006-11-27 10:52:42.000000000 +0000
   10.54 -@@ -821,7 +821,8 @@
   10.55 - 
   10.56 - 	ipoib_mcast_stop_thread(dev, 0);
   10.57 - 
   10.58 --	spin_lock_irqsave(&dev->xmit_lock, flags);
   10.59 -+	local_irq_save(flags);
   10.60 -+	netif_tx_lock(dev);
   10.61 - 	spin_lock(&priv->lock);
   10.62 - 
   10.63 - 	/*
   10.64 -@@ -896,7 +897,8 @@
   10.65 - 	}
   10.66 - 
   10.67 - 	spin_unlock(&priv->lock);
   10.68 --	spin_unlock_irqrestore(&dev->xmit_lock, flags);
   10.69 -+	netif_tx_unlock(dev);
   10.70 -+	local_irq_restore(flags);
   10.71 - 
   10.72 - 	/* We have to cancel outside of the spinlock */
   10.73 - 	list_for_each_entry_safe(mcast, tmcast, &remove_list, list) {
   10.74 -Index: tmp-xxx/drivers/media/dvb/dvb-core/dvb_net.c
   10.75 -===================================================================
   10.76 ---- tmp-xxx.orig/drivers/media/dvb/dvb-core/dvb_net.c	2006-11-15 10:38:39.000000000 +0000
   10.77 -+++ tmp-xxx/drivers/media/dvb/dvb-core/dvb_net.c	2006-11-27 10:52:42.000000000 +0000
   10.78 -@@ -1053,7 +1053,7 @@
   10.79 - 
   10.80 - 	dvb_net_feed_stop(dev);
   10.81 - 	priv->rx_mode = RX_MODE_UNI;
   10.82 --	spin_lock_bh(&dev->xmit_lock);
   10.83 -+	netif_tx_lock_bh(dev);
   10.84 - 
   10.85 - 	if (dev->flags & IFF_PROMISC) {
   10.86 - 		dprintk("%s: promiscuous mode\n", dev->name);
   10.87 -@@ -1078,7 +1078,7 @@
   10.88 - 		}
   10.89 - 	}
   10.90 - 
   10.91 --	spin_unlock_bh(&dev->xmit_lock);
   10.92 -+	netif_tx_unlock_bh(dev);
   10.93 - 	dvb_net_feed_start(dev);
   10.94 - }
   10.95 - 
   10.96 -Index: tmp-xxx/drivers/net/8139cp.c
   10.97 -===================================================================
   10.98 ---- tmp-xxx.orig/drivers/net/8139cp.c	2006-11-15 10:38:39.000000000 +0000
   10.99 -+++ tmp-xxx/drivers/net/8139cp.c	2006-11-27 10:52:42.000000000 +0000
  10.100 -@@ -794,7 +794,7 @@
  10.101 - 	entry = cp->tx_head;
  10.102 - 	eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;
  10.103 - 	if (dev->features & NETIF_F_TSO)
  10.104 --		mss = skb_shinfo(skb)->tso_size;
  10.105 -+		mss = skb_shinfo(skb)->gso_size;
  10.106 - 
  10.107 - 	if (skb_shinfo(skb)->nr_frags == 0) {
  10.108 - 		struct cp_desc *txd = &cp->tx_ring[entry];
  10.109 -Index: tmp-xxx/drivers/net/bnx2.c
  10.110 -===================================================================
  10.111 ---- tmp-xxx.orig/drivers/net/bnx2.c	2006-11-15 10:38:39.000000000 +0000
  10.112 -+++ tmp-xxx/drivers/net/bnx2.c	2006-11-27 10:52:42.000000000 +0000
  10.113 -@@ -1593,7 +1593,7 @@
  10.114 - 		skb = tx_buf->skb;
  10.115 - #ifdef BCM_TSO 
  10.116 - 		/* partial BD completions possible with TSO packets */
  10.117 --		if (skb_shinfo(skb)->tso_size) {
  10.118 -+		if (skb_shinfo(skb)->gso_size) {
  10.119 - 			u16 last_idx, last_ring_idx;
  10.120 - 
  10.121 - 			last_idx = sw_cons +
  10.122 -@@ -1948,7 +1948,7 @@
  10.123 - 	return 1;
  10.124 - }
  10.125 - 
  10.126 --/* Called with rtnl_lock from vlan functions and also dev->xmit_lock
  10.127 -+/* Called with rtnl_lock from vlan functions and also netif_tx_lock
  10.128 -  * from set_multicast.
  10.129 -  */
  10.130 - static void
  10.131 -@@ -4403,7 +4403,7 @@
  10.132 - }
  10.133 - #endif
  10.134 - 
  10.135 --/* Called with dev->xmit_lock.
  10.136 -+/* Called with netif_tx_lock.
  10.137 -  * hard_start_xmit is pseudo-lockless - a lock is only required when
  10.138 -  * the tx queue is full. This way, we get the benefit of lockless
  10.139 -  * operations most of the time without the complexities to handle
  10.140 -@@ -4441,7 +4441,7 @@
  10.141 - 			(TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16));
  10.142 - 	}
  10.143 - #ifdef BCM_TSO 
  10.144 --	if ((mss = skb_shinfo(skb)->tso_size) &&
  10.145 -+	if ((mss = skb_shinfo(skb)->gso_size) &&
  10.146 - 		(skb->len > (bp->dev->mtu + ETH_HLEN))) {
  10.147 - 		u32 tcp_opt_len, ip_tcp_len;
  10.148 - 
  10.149 -Index: tmp-xxx/drivers/net/bonding/bond_main.c
  10.150 -===================================================================
  10.151 ---- tmp-xxx.orig/drivers/net/bonding/bond_main.c	2006-11-15 10:38:39.000000000 +0000
  10.152 -+++ tmp-xxx/drivers/net/bonding/bond_main.c	2006-11-27 10:52:42.000000000 +0000
  10.153 -@@ -1145,8 +1145,7 @@
  10.154 - }
  10.155 - 
  10.156 - #define BOND_INTERSECT_FEATURES \
  10.157 --	(NETIF_F_SG|NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM|\
  10.158 --	NETIF_F_TSO|NETIF_F_UFO)
  10.159 -+	(NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_TSO | NETIF_F_UFO)
  10.160 - 
  10.161 - /* 
  10.162 -  * Compute the common dev->feature set available to all slaves.  Some
  10.163 -@@ -1164,9 +1163,7 @@
  10.164 - 		features &= (slave->dev->features & BOND_INTERSECT_FEATURES);
  10.165 - 
  10.166 - 	if ((features & NETIF_F_SG) && 
  10.167 --	    !(features & (NETIF_F_IP_CSUM |
  10.168 --			  NETIF_F_NO_CSUM |
  10.169 --			  NETIF_F_HW_CSUM)))
  10.170 -+	    !(features & NETIF_F_ALL_CSUM))
  10.171 - 		features &= ~NETIF_F_SG;
  10.172 - 
  10.173 - 	/* 
  10.174 -@@ -4147,7 +4144,7 @@
  10.175 - 	 */
  10.176 - 	bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
  10.177 - 
  10.178 --	/* don't acquire bond device's xmit_lock when 
  10.179 -+	/* don't acquire bond device's netif_tx_lock when
  10.180 - 	 * transmitting */
  10.181 - 	bond_dev->features |= NETIF_F_LLTX;
  10.182 - 
  10.183 -Index: tmp-xxx/drivers/net/chelsio/sge.c
  10.184 -===================================================================
  10.185 ---- tmp-xxx.orig/drivers/net/chelsio/sge.c	2006-11-15 10:38:39.000000000 +0000
  10.186 -+++ tmp-xxx/drivers/net/chelsio/sge.c	2006-11-27 10:52:42.000000000 +0000
  10.187 -@@ -1419,7 +1419,7 @@
  10.188 - 	struct cpl_tx_pkt *cpl;
  10.189 - 
  10.190 - #ifdef NETIF_F_TSO
  10.191 --	if (skb_shinfo(skb)->tso_size) {
  10.192 -+	if (skb_shinfo(skb)->gso_size) {
  10.193 - 		int eth_type;
  10.194 - 		struct cpl_tx_pkt_lso *hdr;
  10.195 - 
  10.196 -@@ -1434,7 +1434,7 @@
  10.197 - 		hdr->ip_hdr_words = skb->nh.iph->ihl;
  10.198 - 		hdr->tcp_hdr_words = skb->h.th->doff;
  10.199 - 		hdr->eth_type_mss = htons(MK_ETH_TYPE_MSS(eth_type,
  10.200 --						skb_shinfo(skb)->tso_size));
  10.201 -+						skb_shinfo(skb)->gso_size));
  10.202 - 		hdr->len = htonl(skb->len - sizeof(*hdr));
  10.203 - 		cpl = (struct cpl_tx_pkt *)hdr;
  10.204 - 		sge->stats.tx_lso_pkts++;
  10.205 -Index: tmp-xxx/drivers/net/e1000/e1000_main.c
  10.206 -===================================================================
  10.207 ---- tmp-xxx.orig/drivers/net/e1000/e1000_main.c	2006-11-15 10:38:39.000000000 +0000
  10.208 -+++ tmp-xxx/drivers/net/e1000/e1000_main.c	2006-11-27 10:52:42.000000000 +0000
  10.209 -@@ -2526,7 +2526,7 @@
  10.210 - 	uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
  10.211 - 	int err;
  10.212 - 
  10.213 --	if (skb_shinfo(skb)->tso_size) {
  10.214 -+	if (skb_shinfo(skb)->gso_size) {
  10.215 - 		if (skb_header_cloned(skb)) {
  10.216 - 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
  10.217 - 			if (err)
  10.218 -@@ -2534,7 +2534,7 @@
  10.219 - 		}
  10.220 - 
  10.221 - 		hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
  10.222 --		mss = skb_shinfo(skb)->tso_size;
  10.223 -+		mss = skb_shinfo(skb)->gso_size;
  10.224 - 		if (skb->protocol == ntohs(ETH_P_IP)) {
  10.225 - 			skb->nh.iph->tot_len = 0;
  10.226 - 			skb->nh.iph->check = 0;
  10.227 -@@ -2651,7 +2651,7 @@
  10.228 - 		 * tso gets written back prematurely before the data is fully
  10.229 - 		 * DMAd to the controller */
  10.230 - 		if (!skb->data_len && tx_ring->last_tx_tso &&
  10.231 --				!skb_shinfo(skb)->tso_size) {
  10.232 -+				!skb_shinfo(skb)->gso_size) {
  10.233 - 			tx_ring->last_tx_tso = 0;
  10.234 - 			size -= 4;
  10.235 - 		}
  10.236 -@@ -2893,7 +2893,7 @@
  10.237 - 	}
  10.238 - 
  10.239 - #ifdef NETIF_F_TSO
  10.240 --	mss = skb_shinfo(skb)->tso_size;
  10.241 -+	mss = skb_shinfo(skb)->gso_size;
  10.242 - 	/* The controller does a simple calculation to 
  10.243 - 	 * make sure there is enough room in the FIFO before
  10.244 - 	 * initiating the DMA for each buffer.  The calc is:
  10.245 -@@ -2935,7 +2935,7 @@
  10.246 - #ifdef NETIF_F_TSO
  10.247 - 	/* Controller Erratum workaround */
  10.248 - 	if (!skb->data_len && tx_ring->last_tx_tso &&
  10.249 --		!skb_shinfo(skb)->tso_size)
  10.250 -+		!skb_shinfo(skb)->gso_size)
  10.251 - 		count++;
  10.252 - #endif
  10.253 - 
  10.254 -Index: tmp-xxx/drivers/net/forcedeth.c
  10.255 -===================================================================
  10.256 ---- tmp-xxx.orig/drivers/net/forcedeth.c	2006-11-15 10:38:39.000000000 +0000
  10.257 -+++ tmp-xxx/drivers/net/forcedeth.c	2006-11-27 10:52:42.000000000 +0000
  10.258 -@@ -482,9 +482,9 @@
  10.259 -  * critical parts:
  10.260 -  * - rx is (pseudo-) lockless: it relies on the single-threading provided
  10.261 -  *	by the arch code for interrupts.
  10.262 -- * - tx setup is lockless: it relies on dev->xmit_lock. Actual submission
  10.263 -+ * - tx setup is lockless: it relies on netif_tx_lock. Actual submission
  10.264 -  *	needs dev->priv->lock :-(
  10.265 -- * - set_multicast_list: preparation lockless, relies on dev->xmit_lock.
  10.266 -+ * - set_multicast_list: preparation lockless, relies on netif_tx_lock.
  10.267 -  */
  10.268 - 
  10.269 - /* in dev: base, irq */
  10.270 -@@ -1016,7 +1016,7 @@
  10.271 - 
  10.272 - /*
  10.273 -  * nv_start_xmit: dev->hard_start_xmit function
  10.274 -- * Called with dev->xmit_lock held.
  10.275 -+ * Called with netif_tx_lock held.
  10.276 -  */
  10.277 - static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
  10.278 - {
  10.279 -@@ -1105,8 +1105,8 @@
  10.280 - 	np->tx_skbuff[nr] = skb;
  10.281 - 
  10.282 - #ifdef NETIF_F_TSO
  10.283 --	if (skb_shinfo(skb)->tso_size)
  10.284 --		tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->tso_size << NV_TX2_TSO_SHIFT);
  10.285 -+	if (skb_shinfo(skb)->gso_size)
  10.286 -+		tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT);
  10.287 - 	else
  10.288 - #endif
  10.289 - 	tx_flags_extra = (skb->ip_summed == CHECKSUM_HW ? (NV_TX2_CHECKSUM_L3|NV_TX2_CHECKSUM_L4) : 0);
  10.290 -@@ -1203,7 +1203,7 @@
  10.291 - 
  10.292 - /*
  10.293 -  * nv_tx_timeout: dev->tx_timeout function
  10.294 -- * Called with dev->xmit_lock held.
  10.295 -+ * Called with netif_tx_lock held.
  10.296 -  */
  10.297 - static void nv_tx_timeout(struct net_device *dev)
  10.298 - {
  10.299 -@@ -1524,7 +1524,7 @@
  10.300 - 		 * Changing the MTU is a rare event, it shouldn't matter.
  10.301 - 		 */
  10.302 - 		disable_irq(dev->irq);
  10.303 --		spin_lock_bh(&dev->xmit_lock);
  10.304 -+		netif_tx_lock_bh(dev);
  10.305 - 		spin_lock(&np->lock);
  10.306 - 		/* stop engines */
  10.307 - 		nv_stop_rx(dev);
  10.308 -@@ -1559,7 +1559,7 @@
  10.309 - 		nv_start_rx(dev);
  10.310 - 		nv_start_tx(dev);
  10.311 - 		spin_unlock(&np->lock);
  10.312 --		spin_unlock_bh(&dev->xmit_lock);
  10.313 -+		netif_tx_unlock_bh(dev);
  10.314 - 		enable_irq(dev->irq);
  10.315 - 	}
  10.316 - 	return 0;
  10.317 -@@ -1594,7 +1594,7 @@
  10.318 - 	memcpy(dev->dev_addr, macaddr->sa_data, ETH_ALEN);
  10.319 - 
  10.320 - 	if (netif_running(dev)) {
  10.321 --		spin_lock_bh(&dev->xmit_lock);
  10.322 -+		netif_tx_lock_bh(dev);
  10.323 - 		spin_lock_irq(&np->lock);
  10.324 - 
  10.325 - 		/* stop rx engine */
  10.326 -@@ -1606,7 +1606,7 @@
  10.327 - 		/* restart rx engine */
  10.328 - 		nv_start_rx(dev);
  10.329 - 		spin_unlock_irq(&np->lock);
  10.330 --		spin_unlock_bh(&dev->xmit_lock);
  10.331 -+		netif_tx_unlock_bh(dev);
  10.332 - 	} else {
  10.333 - 		nv_copy_mac_to_hw(dev);
  10.334 - 	}
  10.335 -@@ -1615,7 +1615,7 @@
  10.336 - 
  10.337 - /*
  10.338 -  * nv_set_multicast: dev->set_multicast function
  10.339 -- * Called with dev->xmit_lock held.
  10.340 -+ * Called with netif_tx_lock held.
  10.341 -  */
  10.342 - static void nv_set_multicast(struct net_device *dev)
  10.343 - {
  10.344 -Index: tmp-xxx/drivers/net/hamradio/6pack.c
  10.345 -===================================================================
  10.346 ---- tmp-xxx.orig/drivers/net/hamradio/6pack.c	2006-11-15 10:38:39.000000000 +0000
  10.347 -+++ tmp-xxx/drivers/net/hamradio/6pack.c	2006-11-27 10:52:42.000000000 +0000
  10.348 -@@ -308,9 +308,9 @@
  10.349 - {
  10.350 - 	struct sockaddr_ax25 *sa = addr;
  10.351 - 
  10.352 --	spin_lock_irq(&dev->xmit_lock);
  10.353 -+	netif_tx_lock_bh(dev);
  10.354 - 	memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
  10.355 --	spin_unlock_irq(&dev->xmit_lock);
  10.356 -+	netif_tx_unlock_bh(dev);
  10.357 - 
  10.358 - 	return 0;
  10.359 - }
  10.360 -@@ -767,9 +767,9 @@
  10.361 - 			break;
  10.362 - 		}
  10.363 - 
  10.364 --		spin_lock_irq(&dev->xmit_lock);
  10.365 -+		netif_tx_lock_bh(dev);
  10.366 - 		memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);
  10.367 --		spin_unlock_irq(&dev->xmit_lock);
  10.368 -+		netif_tx_unlock_bh(dev);
  10.369 - 
  10.370 - 		err = 0;
  10.371 - 		break;
  10.372 -Index: tmp-xxx/drivers/net/hamradio/mkiss.c
  10.373 -===================================================================
  10.374 ---- tmp-xxx.orig/drivers/net/hamradio/mkiss.c	2006-11-15 10:38:39.000000000 +0000
  10.375 -+++ tmp-xxx/drivers/net/hamradio/mkiss.c	2006-11-27 10:52:42.000000000 +0000
  10.376 -@@ -357,9 +357,9 @@
  10.377 - {
  10.378 - 	struct sockaddr_ax25 *sa = addr;
  10.379 - 
  10.380 --	spin_lock_irq(&dev->xmit_lock);
  10.381 -+	netif_tx_lock_bh(dev);
  10.382 - 	memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
  10.383 --	spin_unlock_irq(&dev->xmit_lock);
  10.384 -+	netif_tx_unlock_bh(dev);
  10.385 - 
  10.386 - 	return 0;
  10.387 - }
  10.388 -@@ -886,9 +886,9 @@
  10.389 - 			break;
  10.390 - 		}
  10.391 - 
  10.392 --		spin_lock_irq(&dev->xmit_lock);
  10.393 -+		netif_tx_lock_bh(dev);
  10.394 - 		memcpy(dev->dev_addr, addr, AX25_ADDR_LEN);
  10.395 --		spin_unlock_irq(&dev->xmit_lock);
  10.396 -+		netif_tx_unlock_bh(dev);
  10.397 - 
  10.398 - 		err = 0;
  10.399 - 		break;
  10.400 -Index: tmp-xxx/drivers/net/ifb.c
  10.401 -===================================================================
  10.402 ---- tmp-xxx.orig/drivers/net/ifb.c	2006-11-15 10:38:39.000000000 +0000
  10.403 -+++ tmp-xxx/drivers/net/ifb.c	2006-11-27 10:52:42.000000000 +0000
  10.404 -@@ -76,13 +76,13 @@
  10.405 - 	dp->st_task_enter++;
  10.406 - 	if ((skb = skb_peek(&dp->tq)) == NULL) {
  10.407 - 		dp->st_txq_refl_try++;
  10.408 --		if (spin_trylock(&_dev->xmit_lock)) {
  10.409 -+		if (netif_tx_trylock(_dev)) {
  10.410 - 			dp->st_rxq_enter++;
  10.411 - 			while ((skb = skb_dequeue(&dp->rq)) != NULL) {
  10.412 - 				skb_queue_tail(&dp->tq, skb);
  10.413 - 				dp->st_rx2tx_tran++;
  10.414 - 			}
  10.415 --			spin_unlock(&_dev->xmit_lock);
  10.416 -+			netif_tx_unlock(_dev);
  10.417 - 		} else {
  10.418 - 			/* reschedule */
  10.419 - 			dp->st_rxq_notenter++;
  10.420 -@@ -110,7 +110,7 @@
  10.421 - 		}
  10.422 - 	}
  10.423 - 
  10.424 --	if (spin_trylock(&_dev->xmit_lock)) {
  10.425 -+	if (netif_tx_trylock(_dev)) {
  10.426 - 		dp->st_rxq_check++;
  10.427 - 		if ((skb = skb_peek(&dp->rq)) == NULL) {
  10.428 - 			dp->tasklet_pending = 0;
  10.429 -@@ -118,10 +118,10 @@
  10.430 - 				netif_wake_queue(_dev);
  10.431 - 		} else {
  10.432 - 			dp->st_rxq_rsch++;
  10.433 --			spin_unlock(&_dev->xmit_lock);
  10.434 -+			netif_tx_unlock(_dev);
  10.435 - 			goto resched;
  10.436 - 		}
  10.437 --		spin_unlock(&_dev->xmit_lock);
  10.438 -+		netif_tx_unlock(_dev);
  10.439 - 	} else {
  10.440 - resched:
  10.441 - 		dp->tasklet_pending = 1;
  10.442 -Index: tmp-xxx/drivers/net/irda/vlsi_ir.c
  10.443 -===================================================================
  10.444 ---- tmp-xxx.orig/drivers/net/irda/vlsi_ir.c	2006-11-15 10:38:39.000000000 +0000
  10.445 -+++ tmp-xxx/drivers/net/irda/vlsi_ir.c	2006-11-27 10:52:42.000000000 +0000
  10.446 -@@ -959,7 +959,7 @@
  10.447 - 			    ||  (now.tv_sec==ready.tv_sec && now.tv_usec>=ready.tv_usec))
  10.448 - 			    	break;
  10.449 - 			udelay(100);
  10.450 --			/* must not sleep here - we are called under xmit_lock! */
  10.451 -+			/* must not sleep here - called under netif_tx_lock! */
  10.452 - 		}
  10.453 - 	}
  10.454 - 
  10.455 -Index: tmp-xxx/drivers/net/ixgb/ixgb_main.c
  10.456 -===================================================================
  10.457 ---- tmp-xxx.orig/drivers/net/ixgb/ixgb_main.c	2006-11-15 10:38:39.000000000 +0000
  10.458 -+++ tmp-xxx/drivers/net/ixgb/ixgb_main.c	2006-11-27 10:52:42.000000000 +0000
  10.459 -@@ -1163,7 +1163,7 @@
  10.460 - 	uint16_t ipcse, tucse, mss;
  10.461 - 	int err;
  10.462 - 
  10.463 --	if(likely(skb_shinfo(skb)->tso_size)) {
  10.464 -+	if(likely(skb_shinfo(skb)->gso_size)) {
  10.465 - 		if (skb_header_cloned(skb)) {
  10.466 - 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
  10.467 - 			if (err)
  10.468 -@@ -1171,7 +1171,7 @@
  10.469 - 		}
  10.470 - 
  10.471 - 		hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
  10.472 --		mss = skb_shinfo(skb)->tso_size;
  10.473 -+		mss = skb_shinfo(skb)->gso_size;
  10.474 - 		skb->nh.iph->tot_len = 0;
  10.475 - 		skb->nh.iph->check = 0;
  10.476 - 		skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
  10.477 -Index: tmp-xxx/drivers/net/loopback.c
  10.478 -===================================================================
  10.479 ---- tmp-xxx.orig/drivers/net/loopback.c	2006-11-15 10:38:39.000000000 +0000
  10.480 -+++ tmp-xxx/drivers/net/loopback.c	2006-11-27 10:52:42.000000000 +0000
  10.481 -@@ -74,7 +74,7 @@
  10.482 - 	struct iphdr *iph = skb->nh.iph;
  10.483 - 	struct tcphdr *th = (struct tcphdr*)(skb->nh.raw + (iph->ihl * 4));
  10.484 - 	unsigned int doffset = (iph->ihl + th->doff) * 4;
  10.485 --	unsigned int mtu = skb_shinfo(skb)->tso_size + doffset;
  10.486 -+	unsigned int mtu = skb_shinfo(skb)->gso_size + doffset;
  10.487 - 	unsigned int offset = 0;
  10.488 - 	u32 seq = ntohl(th->seq);
  10.489 - 	u16 id  = ntohs(iph->id);
  10.490 -@@ -139,7 +139,7 @@
  10.491 - #endif
  10.492 - 
  10.493 - #ifdef LOOPBACK_TSO
  10.494 --	if (skb_shinfo(skb)->tso_size) {
  10.495 -+	if (skb_shinfo(skb)->gso_size) {
  10.496 - 		BUG_ON(skb->protocol != htons(ETH_P_IP));
  10.497 - 		BUG_ON(skb->nh.iph->protocol != IPPROTO_TCP);
  10.498 - 
  10.499 -Index: tmp-xxx/drivers/net/mv643xx_eth.c
  10.500 -===================================================================
  10.501 ---- tmp-xxx.orig/drivers/net/mv643xx_eth.c	2006-11-15 10:38:39.000000000 +0000
  10.502 -+++ tmp-xxx/drivers/net/mv643xx_eth.c	2006-11-27 10:52:42.000000000 +0000
  10.503 -@@ -1107,7 +1107,7 @@
  10.504 - 
  10.505 - #ifdef MV643XX_CHECKSUM_OFFLOAD_TX
  10.506 - 	if (has_tiny_unaligned_frags(skb)) {
  10.507 --		if ((skb_linearize(skb, GFP_ATOMIC) != 0)) {
  10.508 -+		if (__skb_linearize(skb)) {
  10.509 - 			stats->tx_dropped++;
  10.510 - 			printk(KERN_DEBUG "%s: failed to linearize tiny "
  10.511 - 					"unaligned fragment\n", dev->name);
  10.512 -Index: tmp-xxx/drivers/net/natsemi.c
  10.513 -===================================================================
  10.514 ---- tmp-xxx.orig/drivers/net/natsemi.c	2006-11-15 10:38:39.000000000 +0000
  10.515 -+++ tmp-xxx/drivers/net/natsemi.c	2006-11-27 10:52:42.000000000 +0000
  10.516 -@@ -323,12 +323,12 @@
  10.517 - The rx process only runs in the interrupt handler. Access from outside
  10.518 - the interrupt handler is only permitted after disable_irq().
  10.519 - 
  10.520 --The rx process usually runs under the dev->xmit_lock. If np->intr_tx_reap
  10.521 -+The rx process usually runs under the netif_tx_lock. If np->intr_tx_reap
  10.522 - is set, then access is permitted under spin_lock_irq(&np->lock).
  10.523 - 
  10.524 - Thus configuration functions that want to access everything must call
  10.525 - 	disable_irq(dev->irq);
  10.526 --	spin_lock_bh(dev->xmit_lock);
  10.527 -+	netif_tx_lock_bh(dev);
  10.528 - 	spin_lock_irq(&np->lock);
  10.529 - 
  10.530 - IV. Notes
  10.531 -Index: tmp-xxx/drivers/net/r8169.c
  10.532 -===================================================================
  10.533 ---- tmp-xxx.orig/drivers/net/r8169.c	2006-11-15 10:38:39.000000000 +0000
  10.534 -+++ tmp-xxx/drivers/net/r8169.c	2006-11-27 10:52:42.000000000 +0000
  10.535 -@@ -2171,7 +2171,7 @@
  10.536 - static inline u32 rtl8169_tso_csum(struct sk_buff *skb, struct net_device *dev)
  10.537 - {
  10.538 - 	if (dev->features & NETIF_F_TSO) {
  10.539 --		u32 mss = skb_shinfo(skb)->tso_size;
  10.540 -+		u32 mss = skb_shinfo(skb)->gso_size;
  10.541 - 
  10.542 - 		if (mss)
  10.543 - 			return LargeSend | ((mss & MSSMask) << MSSShift);
  10.544 -Index: tmp-xxx/drivers/net/s2io.c
  10.545 -===================================================================
  10.546 ---- tmp-xxx.orig/drivers/net/s2io.c	2006-11-15 10:38:39.000000000 +0000
  10.547 -+++ tmp-xxx/drivers/net/s2io.c	2006-11-27 10:52:42.000000000 +0000
  10.548 -@@ -3522,8 +3522,8 @@
  10.549 - 	txdp->Control_1 = 0;
  10.550 - 	txdp->Control_2 = 0;
  10.551 - #ifdef NETIF_F_TSO
  10.552 --	mss = skb_shinfo(skb)->tso_size;
  10.553 --	if (mss) {
  10.554 -+	mss = skb_shinfo(skb)->gso_size;
  10.555 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV4) {
  10.556 - 		txdp->Control_1 |= TXD_TCP_LSO_EN;
  10.557 - 		txdp->Control_1 |= TXD_TCP_LSO_MSS(mss);
  10.558 - 	}
  10.559 -@@ -3543,10 +3543,10 @@
  10.560 - 	}
  10.561 - 
  10.562 - 	frg_len = skb->len - skb->data_len;
  10.563 --	if (skb_shinfo(skb)->ufo_size) {
  10.564 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4) {
  10.565 - 		int ufo_size;
  10.566 - 
  10.567 --		ufo_size = skb_shinfo(skb)->ufo_size;
  10.568 -+		ufo_size = skb_shinfo(skb)->gso_size;
  10.569 - 		ufo_size &= ~7;
  10.570 - 		txdp->Control_1 |= TXD_UFO_EN;
  10.571 - 		txdp->Control_1 |= TXD_UFO_MSS(ufo_size);
  10.572 -@@ -3572,7 +3572,7 @@
  10.573 - 	txdp->Host_Control = (unsigned long) skb;
  10.574 - 	txdp->Control_1 |= TXD_BUFFER0_SIZE(frg_len);
  10.575 - 
  10.576 --	if (skb_shinfo(skb)->ufo_size)
  10.577 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4)
  10.578 - 		txdp->Control_1 |= TXD_UFO_EN;
  10.579 - 
  10.580 - 	frg_cnt = skb_shinfo(skb)->nr_frags;
  10.581 -@@ -3587,12 +3587,12 @@
  10.582 - 		    (sp->pdev, frag->page, frag->page_offset,
  10.583 - 		     frag->size, PCI_DMA_TODEVICE);
  10.584 - 		txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size);
  10.585 --		if (skb_shinfo(skb)->ufo_size)
  10.586 -+		if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4)
  10.587 - 			txdp->Control_1 |= TXD_UFO_EN;
  10.588 - 	}
  10.589 - 	txdp->Control_1 |= TXD_GATHER_CODE_LAST;
  10.590 - 
  10.591 --	if (skb_shinfo(skb)->ufo_size)
  10.592 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4)
  10.593 - 		frg_cnt++; /* as Txd0 was used for inband header */
  10.594 - 
  10.595 - 	tx_fifo = mac_control->tx_FIFO_start[queue];
  10.596 -@@ -3606,7 +3606,7 @@
  10.597 - 	if (mss)
  10.598 - 		val64 |= TX_FIFO_SPECIAL_FUNC;
  10.599 - #endif
  10.600 --	if (skb_shinfo(skb)->ufo_size)
  10.601 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4)
  10.602 - 		val64 |= TX_FIFO_SPECIAL_FUNC;
  10.603 - 	writeq(val64, &tx_fifo->List_Control);
  10.604 - 
  10.605 -Index: tmp-xxx/drivers/net/sky2.c
  10.606 -===================================================================
  10.607 ---- tmp-xxx.orig/drivers/net/sky2.c	2006-11-15 10:38:39.000000000 +0000
  10.608 -+++ tmp-xxx/drivers/net/sky2.c	2006-11-27 10:52:42.000000000 +0000
  10.609 -@@ -1141,7 +1141,7 @@
  10.610 - 	count = sizeof(dma_addr_t) / sizeof(u32);
  10.611 - 	count += skb_shinfo(skb)->nr_frags * count;
  10.612 - 
  10.613 --	if (skb_shinfo(skb)->tso_size)
  10.614 -+	if (skb_shinfo(skb)->gso_size)
  10.615 - 		++count;
  10.616 - 
  10.617 - 	if (skb->ip_summed == CHECKSUM_HW)
  10.618 -@@ -1213,7 +1213,7 @@
  10.619 - 	}
  10.620 - 
  10.621 - 	/* Check for TCP Segmentation Offload */
  10.622 --	mss = skb_shinfo(skb)->tso_size;
  10.623 -+	mss = skb_shinfo(skb)->gso_size;
  10.624 - 	if (mss != 0) {
  10.625 - 		/* just drop the packet if non-linear expansion fails */
  10.626 - 		if (skb_header_cloned(skb) &&
  10.627 -Index: tmp-xxx/drivers/net/tg3.c
  10.628 -===================================================================
  10.629 ---- tmp-xxx.orig/drivers/net/tg3.c	2006-11-15 10:38:39.000000000 +0000
  10.630 -+++ tmp-xxx/drivers/net/tg3.c	2006-11-27 10:52:42.000000000 +0000
  10.631 -@@ -3664,7 +3664,7 @@
  10.632 - #if TG3_TSO_SUPPORT != 0
  10.633 - 	mss = 0;
  10.634 - 	if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
  10.635 --	    (mss = skb_shinfo(skb)->tso_size) != 0) {
  10.636 -+	    (mss = skb_shinfo(skb)->gso_size) != 0) {
  10.637 - 		int tcp_opt_len, ip_tcp_len;
  10.638 - 
  10.639 - 		if (skb_header_cloned(skb) &&
  10.640 -Index: tmp-xxx/drivers/net/tulip/winbond-840.c
  10.641 -===================================================================
  10.642 ---- tmp-xxx.orig/drivers/net/tulip/winbond-840.c	2006-11-15 10:38:39.000000000 +0000
  10.643 -+++ tmp-xxx/drivers/net/tulip/winbond-840.c	2006-11-27 10:52:42.000000000 +0000
  10.644 -@@ -1605,11 +1605,11 @@
  10.645 -  * - get_stats:
  10.646 -  * 	spin_lock_irq(np->lock), doesn't touch hw if not present
  10.647 -  * - hard_start_xmit:
  10.648 -- * 	netif_stop_queue + spin_unlock_wait(&dev->xmit_lock);
  10.649 -+ * 	synchronize_irq + netif_tx_disable;
  10.650 -  * - tx_timeout:
  10.651 -- * 	netif_device_detach + spin_unlock_wait(&dev->xmit_lock);
  10.652 -+ * 	netif_device_detach + netif_tx_disable;
  10.653 -  * - set_multicast_list
  10.654 -- * 	netif_device_detach + spin_unlock_wait(&dev->xmit_lock);
  10.655 -+ * 	netif_device_detach + netif_tx_disable;
  10.656 -  * - interrupt handler
  10.657 -  * 	doesn't touch hw if not present, synchronize_irq waits for
  10.658 -  * 	running instances of the interrupt handler.
  10.659 -@@ -1635,11 +1635,10 @@
  10.660 - 		netif_device_detach(dev);
  10.661 - 		update_csr6(dev, 0);
  10.662 - 		iowrite32(0, ioaddr + IntrEnable);
  10.663 --		netif_stop_queue(dev);
  10.664 - 		spin_unlock_irq(&np->lock);
  10.665 - 
  10.666 --		spin_unlock_wait(&dev->xmit_lock);
  10.667 - 		synchronize_irq(dev->irq);
  10.668 -+		netif_tx_disable(dev);
  10.669 - 	
  10.670 - 		np->stats.rx_missed_errors += ioread32(ioaddr + RxMissed) & 0xffff;
  10.671 - 
  10.672 -Index: tmp-xxx/drivers/net/typhoon.c
  10.673 -===================================================================
  10.674 ---- tmp-xxx.orig/drivers/net/typhoon.c	2006-11-15 10:38:39.000000000 +0000
  10.675 -+++ tmp-xxx/drivers/net/typhoon.c	2006-11-27 10:52:42.000000000 +0000
  10.676 -@@ -340,7 +340,7 @@
  10.677 - #endif
  10.678 - 
  10.679 - #if defined(NETIF_F_TSO)
  10.680 --#define skb_tso_size(x)		(skb_shinfo(x)->tso_size)
  10.681 -+#define skb_tso_size(x)		(skb_shinfo(x)->gso_size)
  10.682 - #define TSO_NUM_DESCRIPTORS	2
  10.683 - #define TSO_OFFLOAD_ON		TYPHOON_OFFLOAD_TCP_SEGMENT
  10.684 - #else
  10.685 -Index: tmp-xxx/drivers/net/via-velocity.c
  10.686 -===================================================================
  10.687 ---- tmp-xxx.orig/drivers/net/via-velocity.c	2006-11-15 10:38:39.000000000 +0000
  10.688 -+++ tmp-xxx/drivers/net/via-velocity.c	2006-11-27 10:52:42.000000000 +0000
  10.689 -@@ -1905,6 +1905,13 @@
  10.690 - 
  10.691 - 	int pktlen = skb->len;
  10.692 - 
  10.693 -+#ifdef VELOCITY_ZERO_COPY_SUPPORT
  10.694 -+	if (skb_shinfo(skb)->nr_frags > 6 && __skb_linearize(skb)) {
  10.695 -+		kfree_skb(skb);
  10.696 -+		return 0;
  10.697 -+	}
  10.698 -+#endif
  10.699 -+
  10.700 - 	spin_lock_irqsave(&vptr->lock, flags);
  10.701 - 
  10.702 - 	index = vptr->td_curr[qnum];
  10.703 -@@ -1920,8 +1927,6 @@
  10.704 - 	 */
  10.705 - 	if (pktlen < ETH_ZLEN) {
  10.706 - 		/* Cannot occur until ZC support */
  10.707 --		if(skb_linearize(skb, GFP_ATOMIC))
  10.708 --			return 0; 
  10.709 - 		pktlen = ETH_ZLEN;
  10.710 - 		memcpy(tdinfo->buf, skb->data, skb->len);
  10.711 - 		memset(tdinfo->buf + skb->len, 0, ETH_ZLEN - skb->len);
  10.712 -@@ -1939,7 +1944,6 @@
  10.713 - 		int nfrags = skb_shinfo(skb)->nr_frags;
  10.714 - 		tdinfo->skb = skb;
  10.715 - 		if (nfrags > 6) {
  10.716 --			skb_linearize(skb, GFP_ATOMIC);
  10.717 - 			memcpy(tdinfo->buf, skb->data, skb->len);
  10.718 - 			tdinfo->skb_dma[0] = tdinfo->buf_dma;
  10.719 - 			td_ptr->tdesc0.pktsize = 
  10.720 -Index: tmp-xxx/drivers/net/wireless/orinoco.c
  10.721 -===================================================================
  10.722 ---- tmp-xxx.orig/drivers/net/wireless/orinoco.c	2006-11-15 10:38:39.000000000 +0000
  10.723 -+++ tmp-xxx/drivers/net/wireless/orinoco.c	2006-11-27 10:52:42.000000000 +0000
  10.724 -@@ -1835,7 +1835,9 @@
  10.725 - 	/* Set promiscuity / multicast*/
  10.726 - 	priv->promiscuous = 0;
  10.727 - 	priv->mc_count = 0;
  10.728 --	__orinoco_set_multicast_list(dev); /* FIXME: what about the xmit_lock */
  10.729 -+
  10.730 -+	/* FIXME: what about netif_tx_lock */
  10.731 -+	__orinoco_set_multicast_list(dev);
  10.732 - 
  10.733 - 	return 0;
  10.734 - }
  10.735 -Index: tmp-xxx/drivers/s390/net/qeth_eddp.c
  10.736 -===================================================================
  10.737 ---- tmp-xxx.orig/drivers/s390/net/qeth_eddp.c	2006-11-15 10:38:39.000000000 +0000
  10.738 -+++ tmp-xxx/drivers/s390/net/qeth_eddp.c	2006-11-27 10:52:42.000000000 +0000
  10.739 -@@ -421,7 +421,7 @@
  10.740 -        }
  10.741 - 	tcph = eddp->skb->h.th;
  10.742 - 	while (eddp->skb_offset < eddp->skb->len) {
  10.743 --		data_len = min((int)skb_shinfo(eddp->skb)->tso_size,
  10.744 -+		data_len = min((int)skb_shinfo(eddp->skb)->gso_size,
  10.745 - 			       (int)(eddp->skb->len - eddp->skb_offset));
  10.746 - 		/* prepare qdio hdr */
  10.747 - 		if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2){
  10.748 -@@ -516,20 +516,20 @@
  10.749 - 	
  10.750 - 	QETH_DBF_TEXT(trace, 5, "eddpcanp");
  10.751 - 	/* can we put multiple skbs in one page? */
  10.752 --	skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->tso_size + hdr_len);
  10.753 -+	skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->gso_size + hdr_len);
  10.754 - 	if (skbs_per_page > 1){
  10.755 --		ctx->num_pages = (skb_shinfo(skb)->tso_segs + 1) /
  10.756 -+		ctx->num_pages = (skb_shinfo(skb)->gso_segs + 1) /
  10.757 - 				 skbs_per_page + 1;
  10.758 - 		ctx->elements_per_skb = 1;
  10.759 - 	} else {
  10.760 - 		/* no -> how many elements per skb? */
  10.761 --		ctx->elements_per_skb = (skb_shinfo(skb)->tso_size + hdr_len +
  10.762 -+		ctx->elements_per_skb = (skb_shinfo(skb)->gso_size + hdr_len +
  10.763 - 				     PAGE_SIZE) >> PAGE_SHIFT;
  10.764 - 		ctx->num_pages = ctx->elements_per_skb *
  10.765 --				 (skb_shinfo(skb)->tso_segs + 1);
  10.766 -+				 (skb_shinfo(skb)->gso_segs + 1);
  10.767 - 	}
  10.768 - 	ctx->num_elements = ctx->elements_per_skb *
  10.769 --			    (skb_shinfo(skb)->tso_segs + 1);
  10.770 -+			    (skb_shinfo(skb)->gso_segs + 1);
  10.771 - }
  10.772 - 
  10.773 - static inline struct qeth_eddp_context *
  10.774 -Index: tmp-xxx/drivers/s390/net/qeth_main.c
  10.775 -===================================================================
  10.776 ---- tmp-xxx.orig/drivers/s390/net/qeth_main.c	2006-11-15 10:38:39.000000000 +0000
  10.777 -+++ tmp-xxx/drivers/s390/net/qeth_main.c	2006-11-27 10:52:42.000000000 +0000
  10.778 -@@ -4454,7 +4454,7 @@
  10.779 - 	queue = card->qdio.out_qs
  10.780 - 		[qeth_get_priority_queue(card, skb, ipv, cast_type)];
  10.781 - 
  10.782 --	if (skb_shinfo(skb)->tso_size)
  10.783 -+	if (skb_shinfo(skb)->gso_size)
  10.784 - 		large_send = card->options.large_send;
  10.785 - 
  10.786 - 	/*are we able to do TSO ? If so ,prepare and send it from here */
  10.787 -@@ -4501,7 +4501,7 @@
  10.788 - 		card->stats.tx_packets++;
  10.789 - 		card->stats.tx_bytes += skb->len;
  10.790 - #ifdef CONFIG_QETH_PERF_STATS
  10.791 --		if (skb_shinfo(skb)->tso_size &&
  10.792 -+		if (skb_shinfo(skb)->gso_size &&
  10.793 - 		   !(large_send == QETH_LARGE_SEND_NO)) {
  10.794 - 			card->perf_stats.large_send_bytes += skb->len;
  10.795 - 			card->perf_stats.large_send_cnt++;
  10.796 -Index: tmp-xxx/drivers/s390/net/qeth_tso.h
  10.797 -===================================================================
  10.798 ---- tmp-xxx.orig/drivers/s390/net/qeth_tso.h	2006-11-15 10:38:39.000000000 +0000
  10.799 -+++ tmp-xxx/drivers/s390/net/qeth_tso.h	2006-11-27 10:52:42.000000000 +0000
  10.800 -@@ -51,7 +51,7 @@
  10.801 - 	hdr->ext.hdr_version = 1;
  10.802 - 	hdr->ext.hdr_len     = 28;
  10.803 - 	/*insert non-fix values */
  10.804 --	hdr->ext.mss = skb_shinfo(skb)->tso_size;
  10.805 -+	hdr->ext.mss = skb_shinfo(skb)->gso_size;
  10.806 - 	hdr->ext.dg_hdr_len = (__u16)(iph->ihl*4 + tcph->doff*4);
  10.807 - 	hdr->ext.payload_len = (__u16)(skb->len - hdr->ext.dg_hdr_len -
  10.808 - 				       sizeof(struct qeth_hdr_tso));
  10.809 -Index: tmp-xxx/include/linux/ethtool.h
  10.810 -===================================================================
  10.811 ---- tmp-xxx.orig/include/linux/ethtool.h	2006-11-15 10:38:39.000000000 +0000
  10.812 -+++ tmp-xxx/include/linux/ethtool.h	2006-11-27 10:52:42.000000000 +0000
  10.813 -@@ -408,6 +408,8 @@
  10.814 - #define ETHTOOL_GPERMADDR	0x00000020 /* Get permanent hardware address */
  10.815 - #define ETHTOOL_GUFO		0x00000021 /* Get UFO enable (ethtool_value) */
  10.816 - #define ETHTOOL_SUFO		0x00000022 /* Set UFO enable (ethtool_value) */
  10.817 -+#define ETHTOOL_GGSO		0x00000023 /* Get GSO enable (ethtool_value) */
  10.818 -+#define ETHTOOL_SGSO		0x00000024 /* Set GSO enable (ethtool_value) */
  10.819 - 
  10.820 - /* compatibility with older code */
  10.821 - #define SPARC_ETH_GSET		ETHTOOL_GSET
  10.822 -Index: tmp-xxx/include/linux/netdevice.h
  10.823 -===================================================================
  10.824 ---- tmp-xxx.orig/include/linux/netdevice.h	2006-11-15 10:38:39.000000000 +0000
  10.825 -+++ tmp-xxx/include/linux/netdevice.h	2006-11-27 10:52:42.000000000 +0000
  10.826 -@@ -230,7 +230,8 @@
  10.827 - 	__LINK_STATE_SCHED,
  10.828 - 	__LINK_STATE_NOCARRIER,
  10.829 - 	__LINK_STATE_RX_SCHED,
  10.830 --	__LINK_STATE_LINKWATCH_PENDING
  10.831 -+	__LINK_STATE_LINKWATCH_PENDING,
  10.832 -+	__LINK_STATE_QDISC_RUNNING,
  10.833 - };
  10.834 - 
  10.835 - 
  10.836 -@@ -306,9 +307,17 @@
  10.837 - #define NETIF_F_HW_VLAN_RX	256	/* Receive VLAN hw acceleration */
  10.838 - #define NETIF_F_HW_VLAN_FILTER	512	/* Receive filtering on VLAN */
  10.839 - #define NETIF_F_VLAN_CHALLENGED	1024	/* Device cannot handle VLAN packets */
  10.840 --#define NETIF_F_TSO		2048	/* Can offload TCP/IP segmentation */
  10.841 -+#define NETIF_F_GSO		2048	/* Enable software GSO. */
  10.842 - #define NETIF_F_LLTX		4096	/* LockLess TX */
  10.843 --#define NETIF_F_UFO             8192    /* Can offload UDP Large Send*/
  10.844 -+
  10.845 -+	/* Segmentation offload features */
  10.846 -+#define NETIF_F_GSO_SHIFT	16
  10.847 -+#define NETIF_F_TSO		(SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)
  10.848 -+#define NETIF_F_UFO		(SKB_GSO_UDPV4 << NETIF_F_GSO_SHIFT)
  10.849 -+#define NETIF_F_GSO_ROBUST	(SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)
  10.850 -+
  10.851 -+#define NETIF_F_GEN_CSUM	(NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
  10.852 -+#define NETIF_F_ALL_CSUM	(NETIF_F_IP_CSUM | NETIF_F_GEN_CSUM)
  10.853 - 
  10.854 - 	struct net_device	*next_sched;
  10.855 - 
  10.856 -@@ -394,6 +403,9 @@
  10.857 - 	struct list_head	qdisc_list;
  10.858 - 	unsigned long		tx_queue_len;	/* Max frames per queue allowed */
  10.859 - 
  10.860 -+	/* Partially transmitted GSO packet. */
  10.861 -+	struct sk_buff		*gso_skb;
  10.862 -+
  10.863 - 	/* ingress path synchronizer */
  10.864 - 	spinlock_t		ingress_lock;
  10.865 - 	struct Qdisc		*qdisc_ingress;
  10.866 -@@ -402,7 +414,7 @@
  10.867 -  * One part is mostly used on xmit path (device)
  10.868 -  */
  10.869 - 	/* hard_start_xmit synchronizer */
  10.870 --	spinlock_t		xmit_lock ____cacheline_aligned_in_smp;
  10.871 -+	spinlock_t		_xmit_lock ____cacheline_aligned_in_smp;
  10.872 - 	/* cpu id of processor entered to hard_start_xmit or -1,
  10.873 - 	   if nobody entered there.
  10.874 - 	 */
  10.875 -@@ -527,6 +539,8 @@
  10.876 - 					 struct net_device *,
  10.877 - 					 struct packet_type *,
  10.878 - 					 struct net_device *);
  10.879 -+	struct sk_buff		*(*gso_segment)(struct sk_buff *skb,
  10.880 -+						int features);
  10.881 - 	void			*af_packet_priv;
  10.882 - 	struct list_head	list;
  10.883 - };
  10.884 -@@ -693,7 +707,8 @@
  10.885 - extern int		dev_set_mtu(struct net_device *, int);
  10.886 - extern int		dev_set_mac_address(struct net_device *,
  10.887 - 					    struct sockaddr *);
  10.888 --extern void		dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev);
  10.889 -+extern int		dev_hard_start_xmit(struct sk_buff *skb,
  10.890 -+					    struct net_device *dev);
  10.891 - 
  10.892 - extern void		dev_init(void);
  10.893 - 
  10.894 -@@ -900,11 +915,43 @@
  10.895 - 	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
  10.896 - }
  10.897 - 
  10.898 -+static inline void netif_tx_lock(struct net_device *dev)
  10.899 -+{
  10.900 -+	spin_lock(&dev->_xmit_lock);
  10.901 -+	dev->xmit_lock_owner = smp_processor_id();
  10.902 -+}
  10.903 -+
  10.904 -+static inline void netif_tx_lock_bh(struct net_device *dev)
  10.905 -+{
  10.906 -+	spin_lock_bh(&dev->_xmit_lock);
  10.907 -+	dev->xmit_lock_owner = smp_processor_id();
  10.908 -+}
  10.909 -+
  10.910 -+static inline int netif_tx_trylock(struct net_device *dev)
  10.911 -+{
  10.912 -+	int err = spin_trylock(&dev->_xmit_lock);
  10.913 -+	if (!err)
  10.914 -+		dev->xmit_lock_owner = smp_processor_id();
  10.915 -+	return err;
  10.916 -+}
  10.917 -+
  10.918 -+static inline void netif_tx_unlock(struct net_device *dev)
  10.919 -+{
  10.920 -+	dev->xmit_lock_owner = -1;
  10.921 -+	spin_unlock(&dev->_xmit_lock);
  10.922 -+}
  10.923 -+
  10.924 -+static inline void netif_tx_unlock_bh(struct net_device *dev)
  10.925 -+{
  10.926 -+	dev->xmit_lock_owner = -1;
  10.927 -+	spin_unlock_bh(&dev->_xmit_lock);
  10.928 -+}
  10.929 -+
  10.930 - static inline void netif_tx_disable(struct net_device *dev)
  10.931 - {
  10.932 --	spin_lock_bh(&dev->xmit_lock);
  10.933 -+	netif_tx_lock_bh(dev);
  10.934 - 	netif_stop_queue(dev);
  10.935 --	spin_unlock_bh(&dev->xmit_lock);
  10.936 -+	netif_tx_unlock_bh(dev);
  10.937 - }
  10.938 - 
  10.939 - /* These functions live elsewhere (drivers/net/net_init.c, but related) */
  10.940 -@@ -932,6 +979,7 @@
  10.941 - extern int		weight_p;
  10.942 - extern int		netdev_set_master(struct net_device *dev, struct net_device *master);
  10.943 - extern int skb_checksum_help(struct sk_buff *skb, int inward);
  10.944 -+extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features);
  10.945 - #ifdef CONFIG_BUG
  10.946 - extern void netdev_rx_csum_fault(struct net_device *dev);
  10.947 - #else
  10.948 -@@ -951,6 +999,18 @@
  10.949 - 
  10.950 - extern void linkwatch_run_queue(void);
  10.951 - 
  10.952 -+static inline int skb_gso_ok(struct sk_buff *skb, int features)
  10.953 -+{
  10.954 -+	int feature = skb_shinfo(skb)->gso_size ?
  10.955 -+		      skb_shinfo(skb)->gso_type << NETIF_F_GSO_SHIFT : 0;
  10.956 -+	return (features & feature) == feature;
  10.957 -+}
  10.958 -+
  10.959 -+static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
  10.960 -+{
  10.961 -+	return !skb_gso_ok(skb, dev->features);
  10.962 -+}
  10.963 -+
  10.964 - #endif /* __KERNEL__ */
  10.965 - 
  10.966 - #endif	/* _LINUX_DEV_H */
  10.967 -Index: tmp-xxx/include/linux/skbuff.h
  10.968 -===================================================================
  10.969 ---- tmp-xxx.orig/include/linux/skbuff.h	2006-11-15 10:38:39.000000000 +0000
  10.970 -+++ tmp-xxx/include/linux/skbuff.h	2006-11-27 10:52:42.000000000 +0000
  10.971 -@@ -134,9 +134,10 @@
  10.972 - struct skb_shared_info {
  10.973 - 	atomic_t	dataref;
  10.974 - 	unsigned short	nr_frags;
  10.975 --	unsigned short	tso_size;
  10.976 --	unsigned short	tso_segs;
  10.977 --	unsigned short  ufo_size;
  10.978 -+	unsigned short	gso_size;
  10.979 -+	/* Warning: this field is not always filled in (UFO)! */
  10.980 -+	unsigned short	gso_segs;
  10.981 -+	unsigned short  gso_type;
  10.982 - 	unsigned int    ip6_frag_id;
  10.983 - 	struct sk_buff	*frag_list;
  10.984 - 	skb_frag_t	frags[MAX_SKB_FRAGS];
  10.985 -@@ -168,6 +169,14 @@
  10.986 - 	SKB_FCLONE_CLONE,
  10.987 - };
  10.988 - 
  10.989 -+enum {
  10.990 -+	SKB_GSO_TCPV4 = 1 << 0,
  10.991 -+	SKB_GSO_UDPV4 = 1 << 1,
  10.992 -+
  10.993 -+	/* This indicates the skb is from an untrusted source. */
  10.994 -+	SKB_GSO_DODGY = 1 << 2,
  10.995 -+};
  10.996 -+
  10.997 - /** 
  10.998 -  *	struct sk_buff - socket buffer
  10.999 -  *	@next: Next buffer in list
 10.1000 -@@ -1148,18 +1157,34 @@
 10.1001 - 	return 0;
 10.1002 - }
 10.1003 - 
 10.1004 -+static inline int __skb_linearize(struct sk_buff *skb)
 10.1005 -+{
 10.1006 -+	return __pskb_pull_tail(skb, skb->data_len) ? 0 : -ENOMEM;
 10.1007 -+}
 10.1008 -+
 10.1009 - /**
 10.1010 -  *	skb_linearize - convert paged skb to linear one
 10.1011 -  *	@skb: buffer to linarize
 10.1012 -- *	@gfp: allocation mode
 10.1013 -  *
 10.1014 -  *	If there is no free memory -ENOMEM is returned, otherwise zero
 10.1015 -  *	is returned and the old skb data released.
 10.1016 -  */
 10.1017 --extern int __skb_linearize(struct sk_buff *skb, gfp_t gfp);
 10.1018 --static inline int skb_linearize(struct sk_buff *skb, gfp_t gfp)
 10.1019 -+static inline int skb_linearize(struct sk_buff *skb)
 10.1020 -+{
 10.1021 -+	return skb_is_nonlinear(skb) ? __skb_linearize(skb) : 0;
 10.1022 -+}
 10.1023 -+
 10.1024 -+/**
 10.1025 -+ *	skb_linearize_cow - make sure skb is linear and writable
 10.1026 -+ *	@skb: buffer to process
 10.1027 -+ *
 10.1028 -+ *	If there is no free memory -ENOMEM is returned, otherwise zero
 10.1029 -+ *	is returned and the old skb data released.
 10.1030 -+ */
 10.1031 -+static inline int skb_linearize_cow(struct sk_buff *skb)
 10.1032 - {
 10.1033 --	return __skb_linearize(skb, gfp);
 10.1034 -+	return skb_is_nonlinear(skb) || skb_cloned(skb) ?
 10.1035 -+	       __skb_linearize(skb) : 0;
 10.1036 - }
 10.1037 - 
 10.1038 - /**
 10.1039 -@@ -1254,6 +1279,7 @@
 10.1040 - 				 struct sk_buff *skb1, const u32 len);
 10.1041 - 
 10.1042 - extern void	       skb_release_data(struct sk_buff *skb);
 10.1043 -+extern struct sk_buff *skb_segment(struct sk_buff *skb, int features);
 10.1044 - 
 10.1045 - static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
 10.1046 - 				       int len, void *buffer)
 10.1047 -Index: tmp-xxx/include/net/pkt_sched.h
 10.1048 -===================================================================
 10.1049 ---- tmp-xxx.orig/include/net/pkt_sched.h	2006-11-15 10:38:39.000000000 +0000
 10.1050 -+++ tmp-xxx/include/net/pkt_sched.h	2006-11-27 10:52:42.000000000 +0000
 10.1051 -@@ -218,12 +218,13 @@
 10.1052 - 		struct rtattr *tab);
 10.1053 - extern void qdisc_put_rtab(struct qdisc_rate_table *tab);
 10.1054 - 
 10.1055 --extern int qdisc_restart(struct net_device *dev);
 10.1056 -+extern void __qdisc_run(struct net_device *dev);
 10.1057 - 
 10.1058 - static inline void qdisc_run(struct net_device *dev)
 10.1059 - {
 10.1060 --	while (!netif_queue_stopped(dev) && qdisc_restart(dev) < 0)
 10.1061 --		/* NOTHING */;
 10.1062 -+	if (!netif_queue_stopped(dev) &&
 10.1063 -+	    !test_and_set_bit(__LINK_STATE_QDISC_RUNNING, &dev->state))
 10.1064 -+		__qdisc_run(dev);
 10.1065 - }
 10.1066 - 
 10.1067 - extern int tc_classify(struct sk_buff *skb, struct tcf_proto *tp,
 10.1068 -Index: tmp-xxx/include/net/protocol.h
 10.1069 -===================================================================
 10.1070 ---- tmp-xxx.orig/include/net/protocol.h	2006-11-15 10:38:39.000000000 +0000
 10.1071 -+++ tmp-xxx/include/net/protocol.h	2006-11-27 10:52:42.000000000 +0000
 10.1072 -@@ -37,6 +37,8 @@
 10.1073 - struct net_protocol {
 10.1074 - 	int			(*handler)(struct sk_buff *skb);
 10.1075 - 	void			(*err_handler)(struct sk_buff *skb, u32 info);
 10.1076 -+	struct sk_buff	       *(*gso_segment)(struct sk_buff *skb,
 10.1077 -+					       int features);
 10.1078 - 	int			no_policy;
 10.1079 - };
 10.1080 - 
 10.1081 -Index: tmp-xxx/include/net/sock.h
 10.1082 -===================================================================
 10.1083 ---- tmp-xxx.orig/include/net/sock.h	2006-11-15 10:38:39.000000000 +0000
 10.1084 -+++ tmp-xxx/include/net/sock.h	2006-11-27 10:52:42.000000000 +0000
 10.1085 -@@ -1064,9 +1064,13 @@
 10.1086 - {
 10.1087 - 	__sk_dst_set(sk, dst);
 10.1088 - 	sk->sk_route_caps = dst->dev->features;
 10.1089 -+	if (sk->sk_route_caps & NETIF_F_GSO)
 10.1090 -+		sk->sk_route_caps |= NETIF_F_TSO;
 10.1091 - 	if (sk->sk_route_caps & NETIF_F_TSO) {
 10.1092 - 		if (sock_flag(sk, SOCK_NO_LARGESEND) || dst->header_len)
 10.1093 - 			sk->sk_route_caps &= ~NETIF_F_TSO;
 10.1094 -+		else 
 10.1095 -+			sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM;
 10.1096 - 	}
 10.1097 - }
 10.1098 - 
 10.1099 -Index: tmp-xxx/include/net/tcp.h
 10.1100 -===================================================================
 10.1101 ---- tmp-xxx.orig/include/net/tcp.h	2006-11-15 10:38:39.000000000 +0000
 10.1102 -+++ tmp-xxx/include/net/tcp.h	2006-11-27 10:52:42.000000000 +0000
 10.1103 -@@ -552,13 +552,13 @@
 10.1104 -  */
 10.1105 - static inline int tcp_skb_pcount(const struct sk_buff *skb)
 10.1106 - {
 10.1107 --	return skb_shinfo(skb)->tso_segs;
 10.1108 -+	return skb_shinfo(skb)->gso_segs;
 10.1109 - }
 10.1110 - 
 10.1111 - /* This is valid iff tcp_skb_pcount() > 1. */
 10.1112 - static inline int tcp_skb_mss(const struct sk_buff *skb)
 10.1113 - {
 10.1114 --	return skb_shinfo(skb)->tso_size;
 10.1115 -+	return skb_shinfo(skb)->gso_size;
 10.1116 - }
 10.1117 - 
 10.1118 - static inline void tcp_dec_pcount_approx(__u32 *count,
 10.1119 -@@ -1063,6 +1063,8 @@
 10.1120 - 
 10.1121 - extern int tcp_v4_destroy_sock(struct sock *sk);
 10.1122 - 
 10.1123 -+extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features);
 10.1124 -+
 10.1125 - #ifdef CONFIG_PROC_FS
 10.1126 - extern int  tcp4_proc_init(void);
 10.1127 - extern void tcp4_proc_exit(void);
 10.1128 -Index: tmp-xxx/net/atm/clip.c
 10.1129 -===================================================================
 10.1130 ---- tmp-xxx.orig/net/atm/clip.c	2006-11-15 10:38:39.000000000 +0000
 10.1131 -+++ tmp-xxx/net/atm/clip.c	2006-11-27 10:52:42.000000000 +0000
 10.1132 -@@ -101,7 +101,7 @@
 10.1133 - 		printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n",clip_vcc);
 10.1134 - 		return;
 10.1135 - 	}
 10.1136 --	spin_lock_bh(&entry->neigh->dev->xmit_lock);	/* block clip_start_xmit() */
 10.1137 -+	netif_tx_lock_bh(entry->neigh->dev);	/* block clip_start_xmit() */
 10.1138 - 	entry->neigh->used = jiffies;
 10.1139 - 	for (walk = &entry->vccs; *walk; walk = &(*walk)->next)
 10.1140 - 		if (*walk == clip_vcc) {
 10.1141 -@@ -125,7 +125,7 @@
 10.1142 - 	printk(KERN_CRIT "ATMARP: unlink_clip_vcc failed (entry %p, vcc "
 10.1143 - 	  "0x%p)\n",entry,clip_vcc);
 10.1144 - out:
 10.1145 --	spin_unlock_bh(&entry->neigh->dev->xmit_lock);
 10.1146 -+	netif_tx_unlock_bh(entry->neigh->dev);
 10.1147 - }
 10.1148 - 
 10.1149 - /* The neighbour entry n->lock is held. */
 10.1150 -Index: tmp-xxx/net/bridge/br_device.c
 10.1151 -===================================================================
 10.1152 ---- tmp-xxx.orig/net/bridge/br_device.c	2006-11-15 10:38:39.000000000 +0000
 10.1153 -+++ tmp-xxx/net/bridge/br_device.c	2006-11-27 10:52:42.000000000 +0000
 10.1154 -@@ -146,9 +146,9 @@
 10.1155 - 	struct net_bridge *br = netdev_priv(dev);
 10.1156 - 
 10.1157 - 	if (data)
 10.1158 --		br->feature_mask |= NETIF_F_IP_CSUM;
 10.1159 -+		br->feature_mask |= NETIF_F_NO_CSUM;
 10.1160 - 	else
 10.1161 --		br->feature_mask &= ~NETIF_F_IP_CSUM;
 10.1162 -+		br->feature_mask &= ~NETIF_F_ALL_CSUM;
 10.1163 - 
 10.1164 - 	br_features_recompute(br);
 10.1165 - 	return 0;
 10.1166 -@@ -185,6 +185,6 @@
 10.1167 - 	dev->set_mac_address = br_set_mac_address;
 10.1168 - 	dev->priv_flags = IFF_EBRIDGE;
 10.1169 - 
 10.1170 -- 	dev->features = NETIF_F_SG | NETIF_F_FRAGLIST
 10.1171 -- 		| NETIF_F_HIGHDMA | NETIF_F_TSO | NETIF_F_IP_CSUM;
 10.1172 -+ 	dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
 10.1173 -+ 			NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_GSO_ROBUST;
 10.1174 - }
 10.1175 -Index: tmp-xxx/net/bridge/br_forward.c
 10.1176 -===================================================================
 10.1177 ---- tmp-xxx.orig/net/bridge/br_forward.c	2006-11-15 10:38:39.000000000 +0000
 10.1178 -+++ tmp-xxx/net/bridge/br_forward.c	2006-11-27 10:52:42.000000000 +0000
 10.1179 -@@ -32,7 +32,7 @@
 10.1180 - int br_dev_queue_push_xmit(struct sk_buff *skb)
 10.1181 - {
 10.1182 - 	/* drop mtu oversized packets except tso */
 10.1183 --	if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->tso_size)
 10.1184 -+	if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->gso_size)
 10.1185 - 		kfree_skb(skb);
 10.1186 - 	else {
 10.1187 - #ifdef CONFIG_BRIDGE_NETFILTER
 10.1188 -Index: tmp-xxx/net/bridge/br_if.c
 10.1189 -===================================================================
 10.1190 ---- tmp-xxx.orig/net/bridge/br_if.c	2006-11-15 10:38:39.000000000 +0000
 10.1191 -+++ tmp-xxx/net/bridge/br_if.c	2006-11-27 10:52:42.000000000 +0000
 10.1192 -@@ -385,17 +385,28 @@
 10.1193 - 	struct net_bridge_port *p;
 10.1194 - 	unsigned long features, checksum;
 10.1195 - 
 10.1196 --	features = br->feature_mask &~ NETIF_F_IP_CSUM;
 10.1197 --	checksum = br->feature_mask & NETIF_F_IP_CSUM;
 10.1198 -+	checksum = br->feature_mask & NETIF_F_ALL_CSUM ? NETIF_F_NO_CSUM : 0;
 10.1199 -+	features = br->feature_mask & ~NETIF_F_ALL_CSUM;
 10.1200 - 
 10.1201 - 	list_for_each_entry(p, &br->port_list, list) {
 10.1202 --		if (!(p->dev->features 
 10.1203 --		      & (NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM)))
 10.1204 -+		unsigned long feature = p->dev->features;
 10.1205 -+
 10.1206 -+		if (checksum & NETIF_F_NO_CSUM && !(feature & NETIF_F_NO_CSUM))
 10.1207 -+			checksum ^= NETIF_F_NO_CSUM | NETIF_F_HW_CSUM;
 10.1208 -+		if (checksum & NETIF_F_HW_CSUM && !(feature & NETIF_F_HW_CSUM))
 10.1209 -+			checksum ^= NETIF_F_HW_CSUM | NETIF_F_IP_CSUM;
 10.1210 -+		if (!(feature & NETIF_F_IP_CSUM))
 10.1211 - 			checksum = 0;
 10.1212 --		features &= p->dev->features;
 10.1213 -+
 10.1214 -+		if (feature & NETIF_F_GSO)
 10.1215 -+			feature |= NETIF_F_TSO;
 10.1216 -+		feature |= NETIF_F_GSO;
 10.1217 -+
 10.1218 -+		features &= feature;
 10.1219 - 	}
 10.1220 - 
 10.1221 --	br->dev->features = features | checksum | NETIF_F_LLTX;
 10.1222 -+	br->dev->features = features | checksum | NETIF_F_LLTX |
 10.1223 -+			    NETIF_F_GSO_ROBUST;
 10.1224 - }
 10.1225 - 
 10.1226 - /* called with RTNL */
 10.1227 -Index: tmp-xxx/net/bridge/br_netfilter.c
 10.1228 -===================================================================
 10.1229 ---- tmp-xxx.orig/net/bridge/br_netfilter.c	2006-11-15 10:38:39.000000000 +0000
 10.1230 -+++ tmp-xxx/net/bridge/br_netfilter.c	2006-11-27 10:52:42.000000000 +0000
 10.1231 -@@ -743,7 +743,7 @@
 10.1232 - {
 10.1233 - 	if (skb->protocol == htons(ETH_P_IP) &&
 10.1234 - 	    skb->len > skb->dev->mtu &&
 10.1235 --	    !(skb_shinfo(skb)->ufo_size || skb_shinfo(skb)->tso_size))
 10.1236 -+	    !skb_shinfo(skb)->gso_size)
 10.1237 - 		return ip_fragment(skb, br_dev_queue_push_xmit);
 10.1238 - 	else
 10.1239 - 		return br_dev_queue_push_xmit(skb);
 10.1240 -Index: tmp-xxx/net/core/dev.c
 10.1241 -===================================================================
 10.1242 ---- tmp-xxx.orig/net/core/dev.c	2006-11-15 10:38:39.000000000 +0000
 10.1243 -+++ tmp-xxx/net/core/dev.c	2006-11-27 10:57:31.000000000 +0000
 10.1244 -@@ -115,6 +115,7 @@
 10.1245 - #include <net/iw_handler.h>
 10.1246 - #endif	/* CONFIG_NET_RADIO */
 10.1247 - #include <asm/current.h>
 10.1248 -+#include <linux/err.h>
 10.1249 - 
 10.1250 - /*
 10.1251 -  *	The list of packet types we will receive (as opposed to discard)
 10.1252 -@@ -1032,7 +1033,7 @@
 10.1253 -  *	taps currently in use.
 10.1254 -  */
 10.1255 - 
 10.1256 --void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 10.1257 -+static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 10.1258 - {
 10.1259 - 	struct packet_type *ptype;
 10.1260 - 
 10.1261 -@@ -1106,6 +1107,45 @@
 10.1262 - 	return ret;
 10.1263 - }
 10.1264 - 
 10.1265 -+/**
 10.1266 -+ *	skb_gso_segment - Perform segmentation on skb.
 10.1267 -+ *	@skb: buffer to segment
 10.1268 -+ *	@features: features for the output path (see dev->features)
 10.1269 -+ *
 10.1270 -+ *	This function segments the given skb and returns a list of segments.
 10.1271 -+ *
 10.1272 -+ *	It may return NULL if the skb requires no segmentation.  This is
 10.1273 -+ *	only possible when GSO is used for verifying header integrity.
 10.1274 -+ */
 10.1275 -+struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features)
 10.1276 -+{
 10.1277 -+	struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);
 10.1278 -+	struct packet_type *ptype;
 10.1279 -+	int type = skb->protocol;
 10.1280 -+
 10.1281 -+	BUG_ON(skb_shinfo(skb)->frag_list);
 10.1282 -+	BUG_ON(skb->ip_summed != CHECKSUM_HW);
 10.1283 -+
 10.1284 -+	skb->mac.raw = skb->data;
 10.1285 -+	skb->mac_len = skb->nh.raw - skb->data;
 10.1286 -+	__skb_pull(skb, skb->mac_len);
 10.1287 -+
 10.1288 -+	rcu_read_lock();
 10.1289 -+	list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type) & 15], list) {
 10.1290 -+		if (ptype->type == type && !ptype->dev && ptype->gso_segment) {
 10.1291 -+			segs = ptype->gso_segment(skb, features);
 10.1292 -+			break;
 10.1293 -+		}
 10.1294 -+	}
 10.1295 -+	rcu_read_unlock();
 10.1296 -+
 10.1297 -+	__skb_push(skb, skb->data - skb->mac.raw);
 10.1298 -+
 10.1299 -+	return segs;
 10.1300 -+}
 10.1301 -+
 10.1302 -+EXPORT_SYMBOL(skb_gso_segment);
 10.1303 -+
 10.1304 - /* Take action when hardware reception checksum errors are detected. */
 10.1305 - #ifdef CONFIG_BUG
 10.1306 - void netdev_rx_csum_fault(struct net_device *dev)
 10.1307 -@@ -1142,76 +1182,107 @@
 10.1308 - #define illegal_highdma(dev, skb)	(0)
 10.1309 - #endif
 10.1310 - 
 10.1311 --/* Keep head the same: replace data */
 10.1312 --int __skb_linearize(struct sk_buff *skb, gfp_t gfp_mask)
 10.1313 -+struct dev_gso_cb {
 10.1314 -+	void (*destructor)(struct sk_buff *skb);
 10.1315 -+};
 10.1316 -+
 10.1317 -+#define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
 10.1318 -+
 10.1319 -+static void dev_gso_skb_destructor(struct sk_buff *skb)
 10.1320 - {
 10.1321 --	unsigned int size;
 10.1322 --	u8 *data;
 10.1323 --	long offset;
 10.1324 --	struct skb_shared_info *ninfo;
 10.1325 --	int headerlen = skb->data - skb->head;
 10.1326 --	int expand = (skb->tail + skb->data_len) - skb->end;
 10.1327 --
 10.1328 --	if (skb_shared(skb))
 10.1329 --		BUG();
 10.1330 --
 10.1331 --	if (expand <= 0)
 10.1332 --		expand = 0;
 10.1333 --
 10.1334 --	size = skb->end - skb->head + expand;
 10.1335 --	size = SKB_DATA_ALIGN(size);
 10.1336 --	data = kmalloc(size + sizeof(struct skb_shared_info), gfp_mask);
 10.1337 --	if (!data)
 10.1338 --		return -ENOMEM;
 10.1339 --
 10.1340 --	/* Copy entire thing */
 10.1341 --	if (skb_copy_bits(skb, -headerlen, data, headerlen + skb->len))
 10.1342 --		BUG();
 10.1343 --
 10.1344 --	/* Set up shinfo */
 10.1345 --	ninfo = (struct skb_shared_info*)(data + size);
 10.1346 --	atomic_set(&ninfo->dataref, 1);
 10.1347 --	ninfo->tso_size = skb_shinfo(skb)->tso_size;
 10.1348 --	ninfo->tso_segs = skb_shinfo(skb)->tso_segs;
 10.1349 --	ninfo->ufo_size = skb_shinfo(skb)->ufo_size;
 10.1350 --	ninfo->nr_frags = 0;
 10.1351 --	ninfo->frag_list = NULL;
 10.1352 --
 10.1353 --	/* Offset between the two in bytes */
 10.1354 --	offset = data - skb->head;
 10.1355 --
 10.1356 --	/* Free old data. */
 10.1357 --	skb_release_data(skb);
 10.1358 --
 10.1359 --	skb->head = data;
 10.1360 --	skb->end  = data + size;
 10.1361 --
 10.1362 --	/* Set up new pointers */
 10.1363 --	skb->h.raw   += offset;
 10.1364 --	skb->nh.raw  += offset;
 10.1365 --	skb->mac.raw += offset;
 10.1366 --	skb->tail    += offset;
 10.1367 --	skb->data    += offset;
 10.1368 -+	struct dev_gso_cb *cb;
 10.1369 - 
 10.1370 --	/* We are no longer a clone, even if we were. */
 10.1371 --	skb->cloned    = 0;
 10.1372 -+	do {
 10.1373 -+		struct sk_buff *nskb = skb->next;
 10.1374 - 
 10.1375 --	skb->tail     += skb->data_len;
 10.1376 --	skb->data_len  = 0;
 10.1377 -+		skb->next = nskb->next;
 10.1378 -+		nskb->next = NULL;
 10.1379 -+		kfree_skb(nskb);
 10.1380 -+	} while (skb->next);
 10.1381 -+
 10.1382 -+	cb = DEV_GSO_CB(skb);
 10.1383 -+	if (cb->destructor)
 10.1384 -+		cb->destructor(skb);
 10.1385 -+}
 10.1386 -+
 10.1387 -+/**
 10.1388 -+ *	dev_gso_segment - Perform emulated hardware segmentation on skb.
 10.1389 -+ *	@skb: buffer to segment
 10.1390 -+ *
 10.1391 -+ *	This function segments the given skb and stores the list of segments
 10.1392 -+ *	in skb->next.
 10.1393 -+ */
 10.1394 -+static int dev_gso_segment(struct sk_buff *skb)
 10.1395 -+{
 10.1396 -+	struct net_device *dev = skb->dev;
 10.1397 -+	struct sk_buff *segs;
 10.1398 -+	int features = dev->features & ~(illegal_highdma(dev, skb) ?
 10.1399 -+					 NETIF_F_SG : 0);
 10.1400 -+
 10.1401 -+	segs = skb_gso_segment(skb, features);
 10.1402 -+
 10.1403 -+	/* Verifying header integrity only. */
 10.1404 -+	if (!segs)
 10.1405 -+		return 0;
 10.1406 -+  
 10.1407 -+	if (unlikely(IS_ERR(segs)))
 10.1408 -+		return PTR_ERR(segs);
 10.1409 -+
 10.1410 -+	skb->next = segs;
 10.1411 -+	DEV_GSO_CB(skb)->destructor = skb->destructor;
 10.1412 -+	skb->destructor = dev_gso_skb_destructor;
 10.1413 -+	return 0;
 10.1414 -+}
 10.1415 -+
 10.1416 -+int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 10.1417 -+{
 10.1418 -+	if (likely(!skb->next)) {
 10.1419 -+		if (netdev_nit)
 10.1420 -+			dev_queue_xmit_nit(skb, dev);
 10.1421 -+
 10.1422 -+		if (netif_needs_gso(dev, skb)) {
 10.1423 -+			if (unlikely(dev_gso_segment(skb)))
 10.1424 -+				goto out_kfree_skb;
 10.1425 -+			if (skb->next)
 10.1426 -+				goto gso;
 10.1427 -+		}
 10.1428 -+
 10.1429 -+		return dev->hard_start_xmit(skb, dev);
 10.1430 -+	}
 10.1431 -+
 10.1432 -+gso:
 10.1433 -+	do {
 10.1434 -+		struct sk_buff *nskb = skb->next;
 10.1435 -+		int rc;
 10.1436 -+
 10.1437 -+		skb->next = nskb->next;
 10.1438 -+		nskb->next = NULL;
 10.1439 -+		rc = dev->hard_start_xmit(nskb, dev);
 10.1440 -+		if (unlikely(rc)) {
 10.1441 -+			nskb->next = skb->next;
 10.1442 -+			skb->next = nskb;
 10.1443 -+			return rc;
 10.1444 -+		}
 10.1445 -+		if (unlikely(netif_queue_stopped(dev) && skb->next))
 10.1446 -+			return NETDEV_TX_BUSY;
 10.1447 -+	} while (skb->next);
 10.1448 -+	
 10.1449 -+	skb->destructor = DEV_GSO_CB(skb)->destructor;
 10.1450 -+
 10.1451 -+out_kfree_skb:
 10.1452 -+	kfree_skb(skb);
 10.1453 - 	return 0;
 10.1454 - }
 10.1455 - 
 10.1456 - #define HARD_TX_LOCK(dev, cpu) {			\
 10.1457 - 	if ((dev->features & NETIF_F_LLTX) == 0) {	\
 10.1458 --		spin_lock(&dev->xmit_lock);		\
 10.1459 --		dev->xmit_lock_owner = cpu;		\
 10.1460 -+		netif_tx_lock(dev);			\
 10.1461 - 	}						\
 10.1462 - }
 10.1463 - 
 10.1464 - #define HARD_TX_UNLOCK(dev) {				\
 10.1465 - 	if ((dev->features & NETIF_F_LLTX) == 0) {	\
 10.1466 --		dev->xmit_lock_owner = -1;		\
 10.1467 --		spin_unlock(&dev->xmit_lock);		\
 10.1468 -+		netif_tx_unlock(dev);			\
 10.1469 - 	}						\
 10.1470 - }
 10.1471 - 
 10.1472 -@@ -1247,9 +1318,13 @@
 10.1473 - 	struct Qdisc *q;
 10.1474 - 	int rc = -ENOMEM;
 10.1475 - 
 10.1476 -+	/* GSO will handle the following emulations directly. */
 10.1477 -+	if (netif_needs_gso(dev, skb))
 10.1478 -+		goto gso;
 10.1479 -+
 10.1480 - 	if (skb_shinfo(skb)->frag_list &&
 10.1481 - 	    !(dev->features & NETIF_F_FRAGLIST) &&
 10.1482 --	    __skb_linearize(skb, GFP_ATOMIC))
 10.1483 -+	    __skb_linearize(skb))
 10.1484 - 		goto out_kfree_skb;
 10.1485 - 
 10.1486 - 	/* Fragmented skb is linearized if device does not support SG,
 10.1487 -@@ -1258,25 +1333,26 @@
 10.1488 - 	 */
 10.1489 - 	if (skb_shinfo(skb)->nr_frags &&
 10.1490 - 	    (!(dev->features & NETIF_F_SG) || illegal_highdma(dev, skb)) &&
 10.1491 --	    __skb_linearize(skb, GFP_ATOMIC))
 10.1492 -+	    __skb_linearize(skb))
 10.1493 - 		goto out_kfree_skb;
 10.1494 - 
 10.1495 - 	/* If packet is not checksummed and device does not support
 10.1496 - 	 * checksumming for this protocol, complete checksumming here.
 10.1497 - 	 */
 10.1498 - 	if (skb->ip_summed == CHECKSUM_HW &&
 10.1499 --	    (!(dev->features & (NETIF_F_HW_CSUM | NETIF_F_NO_CSUM)) &&
 10.1500 -+	    (!(dev->features & NETIF_F_GEN_CSUM) &&
 10.1501 - 	     (!(dev->features & NETIF_F_IP_CSUM) ||
 10.1502 - 	      skb->protocol != htons(ETH_P_IP))))
 10.1503 - 	      	if (skb_checksum_help(skb, 0))
 10.1504 - 	      		goto out_kfree_skb;
 10.1505 - 
 10.1506 -+gso:
 10.1507 - 	spin_lock_prefetch(&dev->queue_lock);
 10.1508 - 
 10.1509 - 	/* Disable soft irqs for various locks below. Also 
 10.1510 - 	 * stops preemption for RCU. 
 10.1511 - 	 */
 10.1512 --	local_bh_disable(); 
 10.1513 -+	rcu_read_lock_bh(); 
 10.1514 - 
 10.1515 - 	/* Updates of qdisc are serialized by queue_lock. 
 10.1516 - 	 * The struct Qdisc which is pointed to by qdisc is now a 
 10.1517 -@@ -1310,8 +1386,8 @@
 10.1518 - 	/* The device has no queue. Common case for software devices:
 10.1519 - 	   loopback, all the sorts of tunnels...
 10.1520 - 
 10.1521 --	   Really, it is unlikely that xmit_lock protection is necessary here.
 10.1522 --	   (f.e. loopback and IP tunnels are clean ignoring statistics
 10.1523 -+	   Really, it is unlikely that netif_tx_lock protection is necessary
 10.1524 -+	   here.  (f.e. loopback and IP tunnels are clean ignoring statistics
 10.1525 - 	   counters.)
 10.1526 - 	   However, it is possible, that they rely on protection
 10.1527 - 	   made by us here.
 10.1528 -@@ -1327,11 +1403,8 @@
 10.1529 - 			HARD_TX_LOCK(dev, cpu);
 10.1530 - 
 10.1531 - 			if (!netif_queue_stopped(dev)) {
 10.1532 --				if (netdev_nit)
 10.1533 --					dev_queue_xmit_nit(skb, dev);
 10.1534 --
 10.1535 - 				rc = 0;
 10.1536 --				if (!dev->hard_start_xmit(skb, dev)) {
 10.1537 -+				if (!dev_hard_start_xmit(skb, dev)) {
 10.1538 - 					HARD_TX_UNLOCK(dev);
 10.1539 - 					goto out;
 10.1540 - 				}
 10.1541 -@@ -1350,13 +1423,13 @@
 10.1542 - 	}
 10.1543 - 
 10.1544 - 	rc = -ENETDOWN;
 10.1545 --	local_bh_enable();
 10.1546 -+	rcu_read_unlock_bh();
 10.1547 - 
 10.1548 - out_kfree_skb:
 10.1549 - 	kfree_skb(skb);
 10.1550 - 	return rc;
 10.1551 - out:
 10.1552 --	local_bh_enable();
 10.1553 -+	rcu_read_unlock_bh();
 10.1554 - 	return rc;
 10.1555 - }
 10.1556 - 
 10.1557 -@@ -2671,7 +2744,7 @@
 10.1558 - 	BUG_ON(dev->reg_state != NETREG_UNINITIALIZED);
 10.1559 - 
 10.1560 - 	spin_lock_init(&dev->queue_lock);
 10.1561 --	spin_lock_init(&dev->xmit_lock);
 10.1562 -+	spin_lock_init(&dev->_xmit_lock);
 10.1563 - 	dev->xmit_lock_owner = -1;
 10.1564 - #ifdef CONFIG_NET_CLS_ACT
 10.1565 - 	spin_lock_init(&dev->ingress_lock);
 10.1566 -@@ -2715,9 +2788,7 @@
 10.1567 - 
 10.1568 - 	/* Fix illegal SG+CSUM combinations. */
 10.1569 - 	if ((dev->features & NETIF_F_SG) &&
 10.1570 --	    !(dev->features & (NETIF_F_IP_CSUM |
 10.1571 --			       NETIF_F_NO_CSUM |
 10.1572 --			       NETIF_F_HW_CSUM))) {
 10.1573 -+	    !(dev->features & NETIF_F_ALL_CSUM)) {
 10.1574 - 		printk("%s: Dropping NETIF_F_SG since no checksum feature.\n",
 10.1575 - 		       dev->name);
 10.1576 - 		dev->features &= ~NETIF_F_SG;
 10.1577 -@@ -3269,7 +3340,6 @@
 10.1578 - EXPORT_SYMBOL(__dev_get_by_index);
 10.1579 - EXPORT_SYMBOL(__dev_get_by_name);
 10.1580 - EXPORT_SYMBOL(__dev_remove_pack);
 10.1581 --EXPORT_SYMBOL(__skb_linearize);
 10.1582 - EXPORT_SYMBOL(dev_valid_name);
 10.1583 - EXPORT_SYMBOL(dev_add_pack);
 10.1584 - EXPORT_SYMBOL(dev_alloc_name);
 10.1585 -Index: tmp-xxx/net/core/dev_mcast.c
 10.1586 -===================================================================
 10.1587 ---- tmp-xxx.orig/net/core/dev_mcast.c	2006-11-15 10:38:39.000000000 +0000
 10.1588 -+++ tmp-xxx/net/core/dev_mcast.c	2006-11-27 10:52:42.000000000 +0000
 10.1589 -@@ -62,7 +62,7 @@
 10.1590 -  *	Device mc lists are changed by bh at least if IPv6 is enabled,
 10.1591 -  *	so that it must be bh protected.
 10.1592 -  *
 10.1593 -- *	We block accesses to device mc filters with dev->xmit_lock.
 10.1594 -+ *	We block accesses to device mc filters with netif_tx_lock.
 10.1595 -  */
 10.1596 - 
 10.1597 - /*
 10.1598 -@@ -93,9 +93,9 @@
 10.1599 - 
 10.1600 - void dev_mc_upload(struct net_device *dev)
 10.1601 - {
 10.1602 --	spin_lock_bh(&dev->xmit_lock);
 10.1603 -+	netif_tx_lock_bh(dev);
 10.1604 - 	__dev_mc_upload(dev);
 10.1605 --	spin_unlock_bh(&dev->xmit_lock);
 10.1606 -+	netif_tx_unlock_bh(dev);
 10.1607 - }
 10.1608 - 
 10.1609 - /*
 10.1610 -@@ -107,7 +107,7 @@
 10.1611 - 	int err = 0;
 10.1612 - 	struct dev_mc_list *dmi, **dmip;
 10.1613 - 
 10.1614 --	spin_lock_bh(&dev->xmit_lock);
 10.1615 -+	netif_tx_lock_bh(dev);
 10.1616 - 
 10.1617 - 	for (dmip = &dev->mc_list; (dmi = *dmip) != NULL; dmip = &dmi->next) {
 10.1618 - 		/*
 10.1619 -@@ -139,13 +139,13 @@
 10.1620 - 			 */
 10.1621 - 			__dev_mc_upload(dev);
 10.1622 - 			
 10.1623 --			spin_unlock_bh(&dev->xmit_lock);
 10.1624 -+			netif_tx_unlock_bh(dev);
 10.1625 - 			return 0;
 10.1626 - 		}
 10.1627 - 	}
 10.1628 - 	err = -ENOENT;
 10.1629 - done:
 10.1630 --	spin_unlock_bh(&dev->xmit_lock);
 10.1631 -+	netif_tx_unlock_bh(dev);
 10.1632 - 	return err;
 10.1633 - }
 10.1634 - 
 10.1635 -@@ -160,7 +160,7 @@
 10.1636 - 
 10.1637 - 	dmi1 = kmalloc(sizeof(*dmi), GFP_ATOMIC);
 10.1638 - 
 10.1639 --	spin_lock_bh(&dev->xmit_lock);
 10.1640 -+	netif_tx_lock_bh(dev);
 10.1641 - 	for (dmi = dev->mc_list; dmi != NULL; dmi = dmi->next) {
 10.1642 - 		if (memcmp(dmi->dmi_addr, addr, dmi->dmi_addrlen) == 0 &&
 10.1643 - 		    dmi->dmi_addrlen == alen) {
 10.1644 -@@ -176,7 +176,7 @@
 10.1645 - 	}
 10.1646 - 
 10.1647 - 	if ((dmi = dmi1) == NULL) {
 10.1648 --		spin_unlock_bh(&dev->xmit_lock);
 10.1649 -+		netif_tx_unlock_bh(dev);
 10.1650 - 		return -ENOMEM;
 10.1651 - 	}
 10.1652 - 	memcpy(dmi->dmi_addr, addr, alen);
 10.1653 -@@ -189,11 +189,11 @@
 10.1654 - 
 10.1655 - 	__dev_mc_upload(dev);
 10.1656 - 	
 10.1657 --	spin_unlock_bh(&dev->xmit_lock);
 10.1658 -+	netif_tx_unlock_bh(dev);
 10.1659 - 	return 0;
 10.1660 - 
 10.1661 - done:
 10.1662 --	spin_unlock_bh(&dev->xmit_lock);
 10.1663 -+	netif_tx_unlock_bh(dev);
 10.1664 - 	kfree(dmi1);
 10.1665 - 	return err;
 10.1666 - }
 10.1667 -@@ -204,7 +204,7 @@
 10.1668 - 
 10.1669 - void dev_mc_discard(struct net_device *dev)
 10.1670 - {
 10.1671 --	spin_lock_bh(&dev->xmit_lock);
 10.1672 -+	netif_tx_lock_bh(dev);
 10.1673 - 	
 10.1674 - 	while (dev->mc_list != NULL) {
 10.1675 - 		struct dev_mc_list *tmp = dev->mc_list;
 10.1676 -@@ -215,7 +215,7 @@
 10.1677 - 	}
 10.1678 - 	dev->mc_count = 0;
 10.1679 - 
 10.1680 --	spin_unlock_bh(&dev->xmit_lock);
 10.1681 -+	netif_tx_unlock_bh(dev);
 10.1682 - }
 10.1683 - 
 10.1684 - #ifdef CONFIG_PROC_FS
 10.1685 -@@ -250,7 +250,7 @@
 10.1686 - 	struct dev_mc_list *m;
 10.1687 - 	struct net_device *dev = v;
 10.1688 - 
 10.1689 --	spin_lock_bh(&dev->xmit_lock);
 10.1690 -+	netif_tx_lock_bh(dev);
 10.1691 - 	for (m = dev->mc_list; m; m = m->next) {
 10.1692 - 		int i;
 10.1693 - 
 10.1694 -@@ -262,7 +262,7 @@
 10.1695 - 
 10.1696 - 		seq_putc(seq, '\n');
 10.1697 - 	}
 10.1698 --	spin_unlock_bh(&dev->xmit_lock);
 10.1699 -+	netif_tx_unlock_bh(dev);
 10.1700 - 	return 0;
 10.1701 - }
 10.1702 - 
 10.1703 -Index: tmp-xxx/net/core/ethtool.c
 10.1704 -===================================================================
 10.1705 ---- tmp-xxx.orig/net/core/ethtool.c	2006-11-15 10:38:39.000000000 +0000
 10.1706 -+++ tmp-xxx/net/core/ethtool.c	2006-11-27 10:52:42.000000000 +0000
 10.1707 -@@ -30,7 +30,7 @@
 10.1708 - 
 10.1709 - u32 ethtool_op_get_tx_csum(struct net_device *dev)
 10.1710 - {
 10.1711 --	return (dev->features & (NETIF_F_IP_CSUM | NETIF_F_HW_CSUM)) != 0;
 10.1712 -+	return (dev->features & NETIF_F_ALL_CSUM) != 0;
 10.1713 - }
 10.1714 - 
 10.1715 - int ethtool_op_set_tx_csum(struct net_device *dev, u32 data)
 10.1716 -@@ -551,9 +551,7 @@
 10.1717 - 		return -EFAULT;
 10.1718 - 
 10.1719 - 	if (edata.data && 
 10.1720 --	    !(dev->features & (NETIF_F_IP_CSUM |
 10.1721 --			       NETIF_F_NO_CSUM |
 10.1722 --			       NETIF_F_HW_CSUM)))
 10.1723 -+	    !(dev->features & NETIF_F_ALL_CSUM))
 10.1724 - 		return -EINVAL;
 10.1725 - 
 10.1726 - 	return __ethtool_set_sg(dev, edata.data);
 10.1727 -@@ -561,7 +559,7 @@
 10.1728 - 
 10.1729 - static int ethtool_get_tso(struct net_device *dev, char __user *useraddr)
 10.1730 - {
 10.1731 --	struct ethtool_value edata = { ETHTOOL_GTSO };
 10.1732 -+	struct ethtool_value edata = { ETHTOOL_GUFO };
 10.1733 - 
 10.1734 - 	if (!dev->ethtool_ops->get_tso)
 10.1735 - 		return -EOPNOTSUPP;
 10.1736 -@@ -616,6 +614,29 @@
 10.1737 - 	return dev->ethtool_ops->set_ufo(dev, edata.data);
 10.1738 - }
 10.1739 - 
 10.1740 -+static int ethtool_get_gso(struct net_device *dev, char __user *useraddr)
 10.1741 -+{
 10.1742 -+	struct ethtool_value edata = { ETHTOOL_GGSO };
 10.1743 -+
 10.1744 -+	edata.data = dev->features & NETIF_F_GSO;
 10.1745 -+	if (copy_to_user(useraddr, &edata, sizeof(edata)))
 10.1746 -+		 return -EFAULT;
 10.1747 -+	return 0;
 10.1748 -+}
 10.1749 -+
 10.1750 -+static int ethtool_set_gso(struct net_device *dev, char __user *useraddr)
 10.1751 -+{
 10.1752 -+	struct ethtool_value edata;
 10.1753 -+
 10.1754 -+	if (copy_from_user(&edata, useraddr, sizeof(edata)))
 10.1755 -+		return -EFAULT;
 10.1756 -+	if (edata.data)
 10.1757 -+		dev->features |= NETIF_F_GSO;
 10.1758 -+	else
 10.1759 -+		dev->features &= ~NETIF_F_GSO;
 10.1760 -+	return 0;
 10.1761 -+}
 10.1762 -+
 10.1763 - static int ethtool_self_test(struct net_device *dev, char __user *useraddr)
 10.1764 - {
 10.1765 - 	struct ethtool_test test;
 10.1766 -@@ -907,6 +928,12 @@
 10.1767 - 	case ETHTOOL_SUFO:
 10.1768 - 		rc = ethtool_set_ufo(dev, useraddr);
 10.1769 - 		break;
 10.1770 -+	case ETHTOOL_GGSO:
 10.1771 -+		rc = ethtool_get_gso(dev, useraddr);
 10.1772 -+		break;
 10.1773 -+	case ETHTOOL_SGSO:
 10.1774 -+		rc = ethtool_set_gso(dev, useraddr);
 10.1775 -+		break;
 10.1776 - 	default:
 10.1777 - 		rc =  -EOPNOTSUPP;
 10.1778 - 	}
 10.1779 -Index: tmp-xxx/net/core/netpoll.c
 10.1780 -===================================================================
 10.1781 ---- tmp-xxx.orig/net/core/netpoll.c	2006-11-15 10:38:39.000000000 +0000
 10.1782 -+++ tmp-xxx/net/core/netpoll.c	2006-11-27 10:52:42.000000000 +0000
 10.1783 -@@ -273,24 +273,21 @@
 10.1784 - 
 10.1785 - 	do {
 10.1786 - 		npinfo->tries--;
 10.1787 --		spin_lock(&np->dev->xmit_lock);
 10.1788 --		np->dev->xmit_lock_owner = smp_processor_id();
 10.1789 -+		netif_tx_lock(np->dev);
 10.1790 - 
 10.1791 - 		/*
 10.1792 - 		 * network drivers do not expect to be called if the queue is
 10.1793 - 		 * stopped.
 10.1794 - 		 */
 10.1795 - 		if (netif_queue_stopped(np->dev)) {
 10.1796 --			np->dev->xmit_lock_owner = -1;
 10.1797 --			spin_unlock(&np->dev->xmit_lock);
 10.1798 -+			netif_tx_unlock(np->dev);
 10.1799 - 			netpoll_poll(np);
 10.1800 - 			udelay(50);
 10.1801 - 			continue;
 10.1802 - 		}
 10.1803 - 
 10.1804 - 		status = np->dev->hard_start_xmit(skb, np->dev);
 10.1805 --		np->dev->xmit_lock_owner = -1;
 10.1806 --		spin_unlock(&np->dev->xmit_lock);
 10.1807 -+		netif_tx_unlock(np->dev);
 10.1808 - 
 10.1809 - 		/* success */
 10.1810 - 		if(!status) {
 10.1811 -Index: tmp-xxx/net/core/pktgen.c
 10.1812 -===================================================================
 10.1813 ---- tmp-xxx.orig/net/core/pktgen.c	2006-11-15 10:38:39.000000000 +0000
 10.1814 -+++ tmp-xxx/net/core/pktgen.c	2006-11-27 10:52:42.000000000 +0000
 10.1815 -@@ -2586,7 +2586,7 @@
 10.1816 - 		}
 10.1817 - 	}
 10.1818 - 	
 10.1819 --	spin_lock_bh(&odev->xmit_lock);
 10.1820 -+	netif_tx_lock_bh(odev);
 10.1821 - 	if (!netif_queue_stopped(odev)) {
 10.1822 - 
 10.1823 - 		atomic_inc(&(pkt_dev->skb->users));
 10.1824 -@@ -2631,7 +2631,7 @@
 10.1825 - 		pkt_dev->next_tx_ns = 0;
 10.1826 -         }
 10.1827 - 
 10.1828 --	spin_unlock_bh(&odev->xmit_lock);
 10.1829 -+	netif_tx_unlock_bh(odev);
 10.1830 - 	
 10.1831 - 	/* If pkt_dev->count is zero, then run forever */
 10.1832 - 	if ((pkt_dev->count != 0) && (pkt_dev->sofar >= pkt_dev->count)) {
 10.1833 -Index: tmp-xxx/net/core/skbuff.c
 10.1834 -===================================================================
 10.1835 ---- tmp-xxx.orig/net/core/skbuff.c	2006-11-15 10:38:39.000000000 +0000
 10.1836 -+++ tmp-xxx/net/core/skbuff.c	2006-11-27 10:58:31.000000000 +0000
 10.1837 -@@ -164,9 +164,9 @@
 10.1838 - 	shinfo = skb_shinfo(skb);
 10.1839 - 	atomic_set(&shinfo->dataref, 1);
 10.1840 - 	shinfo->nr_frags  = 0;
 10.1841 --	shinfo->tso_size = 0;
 10.1842 --	shinfo->tso_segs = 0;
 10.1843 --	shinfo->ufo_size = 0;
 10.1844 -+	shinfo->gso_size = 0;
 10.1845 -+	shinfo->gso_segs = 0;
 10.1846 -+	shinfo->gso_type = 0;
 10.1847 - 	shinfo->ip6_frag_id = 0;
 10.1848 - 	shinfo->frag_list = NULL;
 10.1849 - 
 10.1850 -@@ -230,9 +230,9 @@
 10.1851 - 
 10.1852 - 	atomic_set(&(skb_shinfo(skb)->dataref), 1);
 10.1853 - 	skb_shinfo(skb)->nr_frags  = 0;
 10.1854 --	skb_shinfo(skb)->tso_size = 0;
 10.1855 --	skb_shinfo(skb)->tso_segs = 0;
 10.1856 --	skb_shinfo(skb)->ufo_size = 0;
 10.1857 -+	skb_shinfo(skb)->gso_size = 0;
 10.1858 -+	skb_shinfo(skb)->gso_segs = 0;
 10.1859 -+	skb_shinfo(skb)->gso_type = 0;
 10.1860 - 	skb_shinfo(skb)->frag_list = NULL;
 10.1861 - out:
 10.1862 - 	return skb;
 10.1863 -@@ -507,9 +507,9 @@
 10.1864 - 	new->tc_index	= old->tc_index;
 10.1865 - #endif
 10.1866 - 	atomic_set(&new->users, 1);
 10.1867 --	skb_shinfo(new)->tso_size = skb_shinfo(old)->tso_size;
 10.1868 --	skb_shinfo(new)->tso_segs = skb_shinfo(old)->tso_segs;
 10.1869 --	skb_shinfo(new)->ufo_size = skb_shinfo(old)->ufo_size;
 10.1870 -+	skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
 10.1871 -+	skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
 10.1872 -+	skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type;
 10.1873 - }
 10.1874 - 
 10.1875 - /**
 10.1876 -@@ -1822,6 +1822,133 @@
 10.1877 - 	return 0;
 10.1878 - }
 10.1879 - 
 10.1880 -+/**
 10.1881 -+ *	skb_segment - Perform protocol segmentation on skb.
 10.1882 -+ *	@skb: buffer to segment
 10.1883 -+ *	@features: features for the output path (see dev->features)
 10.1884 -+ *
 10.1885 -+ *	This function performs segmentation on the given skb.  It returns
 10.1886 -+ *	the segment at the given position.  It returns NULL if there are
 10.1887 -+ *	no more segments to generate, or when an error is encountered.
 10.1888 -+ */
 10.1889 -+struct sk_buff *skb_segment(struct sk_buff *skb, int features)
 10.1890 -+{
 10.1891 -+	struct sk_buff *segs = NULL;
 10.1892 -+	struct sk_buff *tail = NULL;
 10.1893 -+	unsigned int mss = skb_shinfo(skb)->gso_size;
 10.1894 -+	unsigned int doffset = skb->data - skb->mac.raw;
 10.1895 -+	unsigned int offset = doffset;
 10.1896 -+	unsigned int headroom;
 10.1897 -+	unsigned int len;
 10.1898 -+	int sg = features & NETIF_F_SG;
 10.1899 -+	int nfrags = skb_shinfo(skb)->nr_frags;
 10.1900 -+	int err = -ENOMEM;
 10.1901 -+	int i = 0;
 10.1902 -+	int pos;
 10.1903 -+
 10.1904 -+	__skb_push(skb, doffset);
 10.1905 -+	headroom = skb_headroom(skb);
 10.1906 -+	pos = skb_headlen(skb);
 10.1907 -+
 10.1908 -+	do {
 10.1909 -+		struct sk_buff *nskb;
 10.1910 -+		skb_frag_t *frag;
 10.1911 -+		int hsize, nsize;
 10.1912 -+		int k;
 10.1913 -+		int size;
 10.1914 -+
 10.1915 -+		len = skb->len - offset;
 10.1916 -+		if (len > mss)
 10.1917 -+			len = mss;
 10.1918 -+
 10.1919 -+		hsize = skb_headlen(skb) - offset;
 10.1920 -+		if (hsize < 0)
 10.1921 -+			hsize = 0;
 10.1922 -+		nsize = hsize + doffset;
 10.1923 -+		if (nsize > len + doffset || !sg)
 10.1924 -+			nsize = len + doffset;
 10.1925 -+
 10.1926 -+		nskb = alloc_skb(nsize + headroom, GFP_ATOMIC);
 10.1927 -+		if (unlikely(!nskb))
 10.1928 -+			goto err;
 10.1929 -+
 10.1930 -+		if (segs)
 10.1931 -+			tail->next = nskb;
 10.1932 -+		else
 10.1933 -+			segs = nskb;
 10.1934 -+		tail = nskb;
 10.1935 -+
 10.1936 -+		nskb->dev = skb->dev;
 10.1937 -+		nskb->priority = skb->priority;
 10.1938 -+		nskb->protocol = skb->protocol;
 10.1939 -+		nskb->dst = dst_clone(skb->dst);
 10.1940 -+		memcpy(nskb->cb, skb->cb, sizeof(skb->cb));
 10.1941 -+		nskb->pkt_type = skb->pkt_type;
 10.1942 -+		nskb->mac_len = skb->mac_len;
 10.1943 -+
 10.1944 -+		skb_reserve(nskb, headroom);
 10.1945 -+		nskb->mac.raw = nskb->data;
 10.1946 -+		nskb->nh.raw = nskb->data + skb->mac_len;
 10.1947 -+		nskb->h.raw = nskb->nh.raw + (skb->h.raw - skb->nh.raw);
 10.1948 -+		memcpy(skb_put(nskb, doffset), skb->data, doffset);
 10.1949 -+
 10.1950 -+		if (!sg) {
 10.1951 -+			nskb->csum = skb_copy_and_csum_bits(skb, offset,
 10.1952 -+							    skb_put(nskb, len),
 10.1953 -+							    len, 0);
 10.1954 -+			continue;
 10.1955 -+		}
 10.1956 -+
 10.1957 -+		frag = skb_shinfo(nskb)->frags;
 10.1958 -+		k = 0;
 10.1959 -+
 10.1960 -+		nskb->ip_summed = CHECKSUM_HW;
 10.1961 -+		nskb->csum = skb->csum;
 10.1962 -+		memcpy(skb_put(nskb, hsize), skb->data + offset, hsize);
 10.1963 -+
 10.1964 -+		while (pos < offset + len) {
 10.1965 -+			BUG_ON(i >= nfrags);
 10.1966 -+
 10.1967 -+			*frag = skb_shinfo(skb)->frags[i];
 10.1968 -+			get_page(frag->page);
 10.1969 -+			size = frag->size;
 10.1970 -+
 10.1971 -+			if (pos < offset) {
 10.1972 -+				frag->page_offset += offset - pos;
 10.1973 -+				frag->size -= offset - pos;
 10.1974 -+			}
 10.1975 -+
 10.1976 -+			k++;
 10.1977 -+
 10.1978 -+			if (pos + size <= offset + len) {
 10.1979 -+				i++;
 10.1980 -+				pos += size;
 10.1981 -+			} else {
 10.1982 -+				frag->size -= pos + size - (offset + len);
 10.1983 -+				break;
 10.1984 -+			}
 10.1985 -+
 10.1986 -+			frag++;
 10.1987 -+		}
 10.1988 -+
 10.1989 -+		skb_shinfo(nskb)->nr_frags = k;
 10.1990 -+		nskb->data_len = len - hsize;
 10.1991 -+		nskb->len += nskb->data_len;
 10.1992 -+		nskb->truesize += nskb->data_len;
 10.1993 -+	} while ((offset += len) < skb->len);
 10.1994 -+
 10.1995 -+	return segs;
 10.1996 -+
 10.1997 -+err:
 10.1998 -+	while ((skb = segs)) {
 10.1999 -+		segs = skb->next;
 10.2000 -+		kfree(skb);
 10.2001 -+	}
 10.2002 -+	return ERR_PTR(err);
 10.2003 -+}
 10.2004 -+
 10.2005 -+EXPORT_SYMBOL_GPL(skb_segment);
 10.2006 -+
 10.2007 - void __init skb_init(void)
 10.2008 - {
 10.2009 - 	skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
 10.2010 -Index: tmp-xxx/net/decnet/dn_nsp_in.c
 10.2011 -===================================================================
 10.2012 ---- tmp-xxx.orig/net/decnet/dn_nsp_in.c	2006-11-15 10:38:39.000000000 +0000
 10.2013 -+++ tmp-xxx/net/decnet/dn_nsp_in.c	2006-11-27 10:52:42.000000000 +0000
 10.2014 -@@ -801,8 +801,7 @@
 10.2015 - 		 * We linearize everything except data segments here.
 10.2016 - 		 */
 10.2017 - 		if (cb->nsp_flags & ~0x60) {
 10.2018 --			if (unlikely(skb_is_nonlinear(skb)) &&
 10.2019 --			    skb_linearize(skb, GFP_ATOMIC) != 0)
 10.2020 -+			if (unlikely(skb_linearize(skb)))
 10.2021 - 				goto free_out;
 10.2022 - 		}
 10.2023 - 
 10.2024 -Index: tmp-xxx/net/decnet/dn_route.c
 10.2025 -===================================================================
 10.2026 ---- tmp-xxx.orig/net/decnet/dn_route.c	2006-11-15 10:38:39.000000000 +0000
 10.2027 -+++ tmp-xxx/net/decnet/dn_route.c	2006-11-27 10:52:42.000000000 +0000
 10.2028 -@@ -629,8 +629,7 @@
 10.2029 - 			padlen);
 10.2030 - 
 10.2031 -         if (flags & DN_RT_PKT_CNTL) {
 10.2032 --		if (unlikely(skb_is_nonlinear(skb)) &&
 10.2033 --		    skb_linearize(skb, GFP_ATOMIC) != 0)
 10.2034 -+		if (unlikely(skb_linearize(skb)))
 10.2035 - 			goto dump_it;
 10.2036 - 
 10.2037 -                 switch(flags & DN_RT_CNTL_MSK) {
 10.2038 -Index: tmp-xxx/net/ipv4/af_inet.c
 10.2039 -===================================================================
 10.2040 ---- tmp-xxx.orig/net/ipv4/af_inet.c	2006-11-15 10:38:39.000000000 +0000
 10.2041 -+++ tmp-xxx/net/ipv4/af_inet.c	2006-11-27 10:52:42.000000000 +0000
 10.2042 -@@ -68,6 +68,7 @@
 10.2043 -  */
 10.2044 - 
 10.2045 - #include <linux/config.h>
 10.2046 -+#include <linux/err.h>
 10.2047 - #include <linux/errno.h>
 10.2048 - #include <linux/types.h>
 10.2049 - #include <linux/socket.h>
 10.2050 -@@ -1084,6 +1085,54 @@
 10.2051 - 
 10.2052 - EXPORT_SYMBOL(inet_sk_rebuild_header);
 10.2053 - 
 10.2054 -+static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int features)
 10.2055 -+{
 10.2056 -+	struct sk_buff *segs = ERR_PTR(-EINVAL);
 10.2057 -+	struct iphdr *iph;
 10.2058 -+	struct net_protocol *ops;
 10.2059 -+	int proto;
 10.2060 -+	int ihl;
 10.2061 -+	int id;
 10.2062 -+
 10.2063 -+	if (!pskb_may_pull(skb, sizeof(*iph)))
 10.2064 -+		goto out;
 10.2065 -+
 10.2066 -+	iph = skb->nh.iph;
 10.2067 -+	ihl = iph->ihl * 4;
 10.2068 -+	if (ihl < sizeof(*iph))
 10.2069 -+		goto out;
 10.2070 -+
 10.2071 -+	if (!pskb_may_pull(skb, ihl))
 10.2072 -+		goto out;
 10.2073 -+
 10.2074 -+	skb->h.raw = __skb_pull(skb, ihl);
 10.2075 -+	iph = skb->nh.iph;
 10.2076 -+	id = ntohs(iph->id);
 10.2077 -+	proto = iph->protocol & (MAX_INET_PROTOS - 1);
 10.2078 -+	segs = ERR_PTR(-EPROTONOSUPPORT);
 10.2079 -+
 10.2080 -+	rcu_read_lock();
 10.2081 -+	ops = rcu_dereference(inet_protos[proto]);
 10.2082 -+	if (ops && ops->gso_segment)
 10.2083 -+		segs = ops->gso_segment(skb, features);
 10.2084 -+	rcu_read_unlock();
 10.2085 -+
 10.2086 -+	if (!segs || unlikely(IS_ERR(segs)))
 10.2087 -+		goto out;
 10.2088 -+
 10.2089 -+	skb = segs;
 10.2090 -+	do {
 10.2091 -+		iph = skb->nh.iph;
 10.2092 -+		iph->id = htons(id++);
 10.2093 -+		iph->tot_len = htons(skb->len - skb->mac_len);
 10.2094 -+		iph->check = 0;
 10.2095 -+		iph->check = ip_fast_csum(skb->nh.raw, iph->ihl);
 10.2096 -+	} while ((skb = skb->next));
 10.2097 -+
 10.2098 -+out:
 10.2099 -+	return segs;
 10.2100 -+}
 10.2101 -+
 10.2102 - #ifdef CONFIG_IP_MULTICAST
 10.2103 - static struct net_protocol igmp_protocol = {
 10.2104 - 	.handler =	igmp_rcv,
 10.2105 -@@ -1093,6 +1142,7 @@
 10.2106 - static struct net_protocol tcp_protocol = {
 10.2107 - 	.handler =	tcp_v4_rcv,
 10.2108 - 	.err_handler =	tcp_v4_err,
 10.2109 -+	.gso_segment =	tcp_tso_segment,
 10.2110 - 	.no_policy =	1,
 10.2111 - };
 10.2112 - 
 10.2113 -@@ -1138,6 +1188,7 @@
 10.2114 - static struct packet_type ip_packet_type = {
 10.2115 - 	.type = __constant_htons(ETH_P_IP),
 10.2116 - 	.func = ip_rcv,
 10.2117 -+	.gso_segment = inet_gso_segment,
 10.2118 - };
 10.2119 - 
 10.2120 - static int __init inet_init(void)
 10.2121 -Index: tmp-xxx/net/ipv4/ip_output.c
 10.2122 -===================================================================
 10.2123 ---- tmp-xxx.orig/net/ipv4/ip_output.c	2006-11-15 10:38:39.000000000 +0000
 10.2124 -+++ tmp-xxx/net/ipv4/ip_output.c	2006-11-27 10:52:42.000000000 +0000
 10.2125 -@@ -210,8 +210,7 @@
 10.2126 - 		return dst_output(skb);
 10.2127 - 	}
 10.2128 - #endif
 10.2129 --	if (skb->len > dst_mtu(skb->dst) &&
 10.2130 --	    !(skb_shinfo(skb)->ufo_size || skb_shinfo(skb)->tso_size))
 10.2131 -+	if (skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size)
 10.2132 - 		return ip_fragment(skb, ip_finish_output2);
 10.2133 - 	else
 10.2134 - 		return ip_finish_output2(skb);
 10.2135 -@@ -362,7 +361,7 @@
 10.2136 - 	}
 10.2137 - 
 10.2138 - 	ip_select_ident_more(iph, &rt->u.dst, sk,
 10.2139 --			     (skb_shinfo(skb)->tso_segs ?: 1) - 1);
 10.2140 -+			     (skb_shinfo(skb)->gso_segs ?: 1) - 1);
 10.2141 - 
 10.2142 - 	/* Add an IP checksum. */
 10.2143 - 	ip_send_check(iph);
 10.2144 -@@ -743,7 +742,8 @@
 10.2145 - 			       (length - transhdrlen));
 10.2146 - 	if (!err) {
 10.2147 - 		/* specify the length of each IP datagram fragment*/
 10.2148 --		skb_shinfo(skb)->ufo_size = (mtu - fragheaderlen);
 10.2149 -+		skb_shinfo(skb)->gso_size = mtu - fragheaderlen;
 10.2150 -+		skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4;
 10.2151 - 		__skb_queue_tail(&sk->sk_write_queue, skb);
 10.2152 - 
 10.2153 - 		return 0;
 10.2154 -@@ -839,7 +839,7 @@
 10.2155 - 	 */
 10.2156 - 	if (transhdrlen &&
 10.2157 - 	    length + fragheaderlen <= mtu &&
 10.2158 --	    rt->u.dst.dev->features&(NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM) &&
 10.2159 -+	    rt->u.dst.dev->features & NETIF_F_ALL_CSUM &&
 10.2160 - 	    !exthdrlen)
 10.2161 - 		csummode = CHECKSUM_HW;
 10.2162 - 
 10.2163 -@@ -1086,14 +1086,16 @@
 10.2164 - 
 10.2165 - 	inet->cork.length += size;
 10.2166 - 	if ((sk->sk_protocol == IPPROTO_UDP) &&
 10.2167 --	    (rt->u.dst.dev->features & NETIF_F_UFO))
 10.2168 --		skb_shinfo(skb)->ufo_size = (mtu - fragheaderlen);
 10.2169 -+	    (rt->u.dst.dev->features & NETIF_F_UFO)) {
 10.2170 -+		skb_shinfo(skb)->gso_size = mtu - fragheaderlen;
 10.2171 -+		skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4;
 10.2172 -+	}
 10.2173 - 
 10.2174 - 
 10.2175 - 	while (size > 0) {
 10.2176 - 		int i;
 10.2177 - 
 10.2178 --		if (skb_shinfo(skb)->ufo_size)
 10.2179 -+		if (skb_shinfo(skb)->gso_size)
 10.2180 - 			len = size;
 10.2181 - 		else {
 10.2182 - 
 10.2183 -Index: tmp-xxx/net/ipv4/ipcomp.c
 10.2184 -===================================================================
 10.2185 ---- tmp-xxx.orig/net/ipv4/ipcomp.c	2006-11-15 10:38:39.000000000 +0000
 10.2186 -+++ tmp-xxx/net/ipv4/ipcomp.c	2006-11-27 10:52:42.000000000 +0000
 10.2187 -@@ -84,7 +84,7 @@
 10.2188 -                         struct xfrm_decap_state *decap, struct sk_buff *skb)
 10.2189 - {
 10.2190 - 	u8 nexthdr;
 10.2191 --	int err = 0;
 10.2192 -+	int err = -ENOMEM;
 10.2193 - 	struct iphdr *iph;
 10.2194 - 	union {
 10.2195 - 		struct iphdr	iph;
 10.2196 -@@ -92,11 +92,8 @@
 10.2197 - 	} tmp_iph;
 10.2198 - 
 10.2199 - 
 10.2200 --	if ((skb_is_nonlinear(skb) || skb_cloned(skb)) &&
 10.2201 --	    skb_linearize(skb, GFP_ATOMIC) != 0) {
 10.2202 --	    	err = -ENOMEM;
 10.2203 -+	if (skb_linearize_cow(skb))
 10.2204 - 	    	goto out;
 10.2205 --	}
 10.2206 - 
 10.2207 - 	skb->ip_summed = CHECKSUM_NONE;
 10.2208 - 
 10.2209 -@@ -171,10 +168,8 @@
 10.2210 - 		goto out_ok;
 10.2211 - 	}
 10.2212 - 
 10.2213 --	if ((skb_is_nonlinear(skb) || skb_cloned(skb)) &&
 10.2214 --	    skb_linearize(skb, GFP_ATOMIC) != 0) {
 10.2215 -+	if (skb_linearize_cow(skb))
 10.2216 - 		goto out_ok;
 10.2217 --	}
 10.2218 - 	
 10.2219 - 	err = ipcomp_compress(x, skb);
 10.2220 - 	iph = skb->nh.iph;
 10.2221 -Index: tmp-xxx/net/ipv4/tcp.c
 10.2222 -===================================================================
 10.2223 ---- tmp-xxx.orig/net/ipv4/tcp.c	2006-11-15 10:38:39.000000000 +0000
 10.2224 -+++ tmp-xxx/net/ipv4/tcp.c	2006-11-27 10:52:42.000000000 +0000
 10.2225 -@@ -257,6 +257,7 @@
 10.2226 - #include <linux/fs.h>
 10.2227 - #include <linux/random.h>
 10.2228 - #include <linux/bootmem.h>
 10.2229 -+#include <linux/err.h>
 10.2230 - 
 10.2231 - #include <net/icmp.h>
 10.2232 - #include <net/tcp.h>
 10.2233 -@@ -570,7 +571,7 @@
 10.2234 - 		skb->ip_summed = CHECKSUM_HW;
 10.2235 - 		tp->write_seq += copy;
 10.2236 - 		TCP_SKB_CB(skb)->end_seq += copy;
 10.2237 --		skb_shinfo(skb)->tso_segs = 0;
 10.2238 -+		skb_shinfo(skb)->gso_segs = 0;
 10.2239 - 
 10.2240 - 		if (!copied)
 10.2241 - 			TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_PSH;
 10.2242 -@@ -621,14 +622,10 @@
 10.2243 - 	ssize_t res;
 10.2244 - 	struct sock *sk = sock->sk;
 10.2245 - 
 10.2246 --#define TCP_ZC_CSUM_FLAGS (NETIF_F_IP_CSUM | NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
 10.2247 --
 10.2248 - 	if (!(sk->sk_route_caps & NETIF_F_SG) ||
 10.2249 --	    !(sk->sk_route_caps & TCP_ZC_CSUM_FLAGS))
 10.2250 -+	    !(sk->sk_route_caps & NETIF_F_ALL_CSUM))
 10.2251 - 		return sock_no_sendpage(sock, page, offset, size, flags);
 10.2252 - 
 10.2253 --#undef TCP_ZC_CSUM_FLAGS
 10.2254 --
 10.2255 - 	lock_sock(sk);
 10.2256 - 	TCP_CHECK_TIMER(sk);
 10.2257 - 	res = do_tcp_sendpages(sk, &page, offset, size, flags);
 10.2258 -@@ -725,9 +722,7 @@
 10.2259 - 				/*
 10.2260 - 				 * Check whether we can use HW checksum.
 10.2261 - 				 */
 10.2262 --				if (sk->sk_route_caps &
 10.2263 --				    (NETIF_F_IP_CSUM | NETIF_F_NO_CSUM |
 10.2264 --				     NETIF_F_HW_CSUM))
 10.2265 -+				if (sk->sk_route_caps & NETIF_F_ALL_CSUM)
 10.2266 - 					skb->ip_summed = CHECKSUM_HW;
 10.2267 - 
 10.2268 - 				skb_entail(sk, tp, skb);
 10.2269 -@@ -823,7 +818,7 @@
 10.2270 - 
 10.2271 - 			tp->write_seq += copy;
 10.2272 - 			TCP_SKB_CB(skb)->end_seq += copy;
 10.2273 --			skb_shinfo(skb)->tso_segs = 0;
 10.2274 -+			skb_shinfo(skb)->gso_segs = 0;
 10.2275 - 
 10.2276 - 			from += copy;
 10.2277 - 			copied += copy;
 10.2278 -@@ -2026,6 +2021,71 @@
 10.2279 - }
 10.2280 - 
 10.2281 - 
 10.2282 -+struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features)
 10.2283 -+{
 10.2284 -+	struct sk_buff *segs = ERR_PTR(-EINVAL);
 10.2285 -+	struct tcphdr *th;
 10.2286 -+	unsigned thlen;
 10.2287 -+	unsigned int seq;
 10.2288 -+	unsigned int delta;
 10.2289 -+	unsigned int oldlen;
 10.2290 -+	unsigned int len;
 10.2291 -+
 10.2292 -+	if (!pskb_may_pull(skb, sizeof(*th)))
 10.2293 -+		goto out;
 10.2294 -+
 10.2295 -+	th = skb->h.th;
 10.2296 -+	thlen = th->doff * 4;
 10.2297 -+	if (thlen < sizeof(*th))
 10.2298 -+		goto out;
 10.2299 -+
 10.2300 -+	if (!pskb_may_pull(skb, thlen))
 10.2301 -+		goto out;
 10.2302 -+
 10.2303 -+	segs = NULL;
 10.2304 -+	if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST))
 10.2305 -+		goto out;
 10.2306 -+
 10.2307 -+	oldlen = (u16)~skb->len;
 10.2308 -+	__skb_pull(skb, thlen);
 10.2309 -+
 10.2310 -+	segs = skb_segment(skb, features);
 10.2311 -+	if (IS_ERR(segs))
 10.2312 -+		goto out;
 10.2313 -+
 10.2314 -+	len = skb_shinfo(skb)->gso_size;
 10.2315 -+	delta = htonl(oldlen + (thlen + len));
 10.2316 -+
 10.2317 -+	skb = segs;
 10.2318 -+	th = skb->h.th;
 10.2319 -+	seq = ntohl(th->seq);
 10.2320 -+
 10.2321 -+	do {
 10.2322 -+		th->fin = th->psh = 0;
 10.2323 -+
 10.2324 -+		th->check = ~csum_fold(th->check + delta);
 10.2325 -+		if (skb->ip_summed != CHECKSUM_HW)
 10.2326 -+			th->check = csum_fold(csum_partial(skb->h.raw, thlen,
 10.2327 -+							   skb->csum));
 10.2328 -+
 10.2329 -+		seq += len;
 10.2330 -+		skb = skb->next;
 10.2331 -+		th = skb->h.th;
 10.2332 -+
 10.2333 -+		th->seq = htonl(seq);
 10.2334 -+		th->cwr = 0;
 10.2335 -+	} while (skb->next);
 10.2336 -+
 10.2337 -+	delta = htonl(oldlen + (skb->tail - skb->h.raw) + skb->data_len);
 10.2338 -+	th->check = ~csum_fold(th->check + delta);
 10.2339 -+	if (skb->ip_summed != CHECKSUM_HW)
 10.2340 -+		th->check = csum_fold(csum_partial(skb->h.raw, thlen,
 10.2341 -+						   skb->csum));
 10.2342 -+
 10.2343 -+out:
 10.2344 -+	return segs;
 10.2345 -+}
 10.2346 -+
 10.2347 - extern void __skb_cb_too_small_for_tcp(int, int);
 10.2348 - extern struct tcp_congestion_ops tcp_reno;
 10.2349 - 
 10.2350 -Index: tmp-xxx/net/ipv4/tcp_input.c
 10.2351 -===================================================================
 10.2352 ---- tmp-xxx.orig/net/ipv4/tcp_input.c	2006-11-15 10:38:39.000000000 +0000
 10.2353 -+++ tmp-xxx/net/ipv4/tcp_input.c	2006-11-27 10:52:42.000000000 +0000
 10.2354 -@@ -1072,7 +1072,7 @@
 10.2355 - 				else
 10.2356 - 					pkt_len = (end_seq -
 10.2357 - 						   TCP_SKB_CB(skb)->seq);
 10.2358 --				if (tcp_fragment(sk, skb, pkt_len, skb_shinfo(skb)->tso_size))
 10.2359 -+				if (tcp_fragment(sk, skb, pkt_len, skb_shinfo(skb)->gso_size))
 10.2360 - 					break;
 10.2361 - 				pcount = tcp_skb_pcount(skb);
 10.2362 - 			}
 10.2363 -Index: tmp-xxx/net/ipv4/tcp_output.c
 10.2364 -===================================================================
 10.2365 ---- tmp-xxx.orig/net/ipv4/tcp_output.c	2006-11-15 10:38:39.000000000 +0000
 10.2366 -+++ tmp-xxx/net/ipv4/tcp_output.c	2006-11-27 10:52:42.000000000 +0000
 10.2367 -@@ -497,15 +497,17 @@
 10.2368 - 		/* Avoid the costly divide in the normal
 10.2369 - 		 * non-TSO case.
 10.2370 - 		 */
 10.2371 --		skb_shinfo(skb)->tso_segs = 1;
 10.2372 --		skb_shinfo(skb)->tso_size = 0;
 10.2373 -+		skb_shinfo(skb)->gso_segs = 1;
 10.2374 -+		skb_shinfo(skb)->gso_size = 0;
 10.2375 -+		skb_shinfo(skb)->gso_type = 0;
 10.2376 - 	} else {
 10.2377 - 		unsigned int factor;
 10.2378 - 
 10.2379 - 		factor = skb->len + (mss_now - 1);
 10.2380 - 		factor /= mss_now;
 10.2381 --		skb_shinfo(skb)->tso_segs = factor;
 10.2382 --		skb_shinfo(skb)->tso_size = mss_now;
 10.2383 -+		skb_shinfo(skb)->gso_segs = factor;
 10.2384 -+		skb_shinfo(skb)->gso_size = mss_now;
 10.2385 -+		skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
 10.2386 - 	}
 10.2387 - }
 10.2388 - 
 10.2389 -@@ -850,7 +852,7 @@
 10.2390 - 
 10.2391 - 	if (!tso_segs ||
 10.2392 - 	    (tso_segs > 1 &&
 10.2393 --	     skb_shinfo(skb)->tso_size != mss_now)) {
 10.2394 -+	     tcp_skb_mss(skb) != mss_now)) {
 10.2395 - 		tcp_set_skb_tso_segs(sk, skb, mss_now);
 10.2396 - 		tso_segs = tcp_skb_pcount(skb);
 10.2397 - 	}
 10.2398 -@@ -1510,8 +1512,9 @@
 10.2399 - 	   tp->snd_una == (TCP_SKB_CB(skb)->end_seq - 1)) {
 10.2400 - 		if (!pskb_trim(skb, 0)) {
 10.2401 - 			TCP_SKB_CB(skb)->seq = TCP_SKB_CB(skb)->end_seq - 1;
 10.2402 --			skb_shinfo(skb)->tso_segs = 1;
 10.2403 --			skb_shinfo(skb)->tso_size = 0;
 10.2404 -+			skb_shinfo(skb)->gso_segs = 1;
 10.2405 -+			skb_shinfo(skb)->gso_size = 0;
 10.2406 -+			skb_shinfo(skb)->gso_type = 0;
 10.2407 - 			skb->ip_summed = CHECKSUM_NONE;
 10.2408 - 			skb->csum = 0;
 10.2409 - 		}
 10.2410 -@@ -1716,8 +1719,9 @@
 10.2411 - 		skb->csum = 0;
 10.2412 - 		TCP_SKB_CB(skb)->flags = (TCPCB_FLAG_ACK | TCPCB_FLAG_FIN);
 10.2413 - 		TCP_SKB_CB(skb)->sacked = 0;
 10.2414 --		skb_shinfo(skb)->tso_segs = 1;
 10.2415 --		skb_shinfo(skb)->tso_size = 0;
 10.2416 -+		skb_shinfo(skb)->gso_segs = 1;
 10.2417 -+		skb_shinfo(skb)->gso_size = 0;
 10.2418 -+		skb_shinfo(skb)->gso_type = 0;
 10.2419 - 
 10.2420 - 		/* FIN eats a sequence byte, write_seq advanced by tcp_queue_skb(). */
 10.2421 - 		TCP_SKB_CB(skb)->seq = tp->write_seq;
 10.2422 -@@ -1749,8 +1753,9 @@
 10.2423 - 	skb->csum = 0;
 10.2424 - 	TCP_SKB_CB(skb)->flags = (TCPCB_FLAG_ACK | TCPCB_FLAG_RST);
 10.2425 - 	TCP_SKB_CB(skb)->sacked = 0;
 10.2426 --	skb_shinfo(skb)->tso_segs = 1;
 10.2427 --	skb_shinfo(skb)->tso_size = 0;
 10.2428 -+	skb_shinfo(skb)->gso_segs = 1;
 10.2429 -+	skb_shinfo(skb)->gso_size = 0;
 10.2430 -+	skb_shinfo(skb)->gso_type = 0;
 10.2431 - 
 10.2432 - 	/* Send it off. */
 10.2433 - 	TCP_SKB_CB(skb)->seq = tcp_acceptable_seq(sk, tp);
 10.2434 -@@ -1833,8 +1838,9 @@
 10.2435 - 	TCP_SKB_CB(skb)->seq = tcp_rsk(req)->snt_isn;
 10.2436 - 	TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq + 1;
 10.2437 - 	TCP_SKB_CB(skb)->sacked = 0;
 10.2438 --	skb_shinfo(skb)->tso_segs = 1;
 10.2439 --	skb_shinfo(skb)->tso_size = 0;
 10.2440 -+	skb_shinfo(skb)->gso_segs = 1;
 10.2441 -+	skb_shinfo(skb)->gso_size = 0;
 10.2442 -+	skb_shinfo(skb)->gso_type = 0;
 10.2443 - 	th->seq = htonl(TCP_SKB_CB(skb)->seq);
 10.2444 - 	th->ack_seq = htonl(tcp_rsk(req)->rcv_isn + 1);
 10.2445 - 	if (req->rcv_wnd == 0) { /* ignored for retransmitted syns */
 10.2446 -@@ -1937,8 +1943,9 @@
 10.2447 - 	TCP_SKB_CB(buff)->flags = TCPCB_FLAG_SYN;
 10.2448 - 	TCP_ECN_send_syn(sk, tp, buff);
 10.2449 - 	TCP_SKB_CB(buff)->sacked = 0;
 10.2450 --	skb_shinfo(buff)->tso_segs = 1;
 10.2451 --	skb_shinfo(buff)->tso_size = 0;
 10.2452 -+	skb_shinfo(buff)->gso_segs = 1;
 10.2453 -+	skb_shinfo(buff)->gso_size = 0;
 10.2454 -+	skb_shinfo(buff)->gso_type = 0;
 10.2455 - 	buff->csum = 0;
 10.2456 - 	TCP_SKB_CB(buff)->seq = tp->write_seq++;
 10.2457 - 	TCP_SKB_CB(buff)->end_seq = tp->write_seq;
 10.2458 -@@ -2042,8 +2049,9 @@
 10.2459 - 		buff->csum = 0;
 10.2460 - 		TCP_SKB_CB(buff)->flags = TCPCB_FLAG_ACK;
 10.2461 - 		TCP_SKB_CB(buff)->sacked = 0;
 10.2462 --		skb_shinfo(buff)->tso_segs = 1;
 10.2463 --		skb_shinfo(buff)->tso_size = 0;
 10.2464 -+		skb_shinfo(buff)->gso_segs = 1;
 10.2465 -+		skb_shinfo(buff)->gso_size = 0;
 10.2466 -+		skb_shinfo(buff)->gso_type = 0;
 10.2467 - 
 10.2468 - 		/* Send it off, this clears delayed acks for us. */
 10.2469 - 		TCP_SKB_CB(buff)->seq = TCP_SKB_CB(buff)->end_seq = tcp_acceptable_seq(sk, tp);
 10.2470 -@@ -2078,8 +2086,9 @@
 10.2471 - 	skb->csum = 0;
 10.2472 - 	TCP_SKB_CB(skb)->flags = TCPCB_FLAG_ACK;
 10.2473 - 	TCP_SKB_CB(skb)->sacked = urgent;
 10.2474 --	skb_shinfo(skb)->tso_segs = 1;
 10.2475 --	skb_shinfo(skb)->tso_size = 0;
 10.2476 -+	skb_shinfo(skb)->gso_segs = 1;
 10.2477 -+	skb_shinfo(skb)->gso_size = 0;
 10.2478 -+	skb_shinfo(skb)->gso_type = 0;
 10.2479 - 
 10.2480 - 	/* Use a previous sequence.  This should cause the other
 10.2481 - 	 * end to send an ack.  Don't queue or clone SKB, just
 10.2482 -Index: tmp-xxx/net/ipv4/xfrm4_output.c
 10.2483 -===================================================================
 10.2484 ---- tmp-xxx.orig/net/ipv4/xfrm4_output.c	2006-11-27 10:52:32.000000000 +0000
 10.2485 -+++ tmp-xxx/net/ipv4/xfrm4_output.c	2006-11-27 10:52:42.000000000 +0000
 10.2486 -@@ -9,6 +9,8 @@
 10.2487 -  */
 10.2488 - 
 10.2489 - #include <linux/compiler.h>
 10.2490 -+#include <linux/if_ether.h>
 10.2491 -+#include <linux/kernel.h>
 10.2492 - #include <linux/skbuff.h>
 10.2493 - #include <linux/spinlock.h>
 10.2494 - #include <linux/netfilter_ipv4.h>
 10.2495 -@@ -158,16 +160,10 @@
 10.2496 - 	goto out_exit;
 10.2497 - }
 10.2498 - 
 10.2499 --static int xfrm4_output_finish(struct sk_buff *skb)
 10.2500 -+static int xfrm4_output_finish2(struct sk_buff *skb)
 10.2501 - {
 10.2502 - 	int err;
 10.2503 - 
 10.2504 --#ifdef CONFIG_NETFILTER
 10.2505 --	if (!skb->dst->xfrm) {
 10.2506 --		IPCB(skb)->flags |= IPSKB_REROUTED;
 10.2507 --		return dst_output(skb);
 10.2508 --	}
 10.2509 --#endif
 10.2510 - 	while (likely((err = xfrm4_output_one(skb)) == 0)) {
 10.2511 - 		nf_reset(skb);
 10.2512 - 
 10.2513 -@@ -180,7 +176,7 @@
 10.2514 - 			return dst_output(skb);
 10.2515 - 
 10.2516 - 		err = nf_hook(PF_INET, NF_IP_POST_ROUTING, &skb, NULL,
 10.2517 --			      skb->dst->dev, xfrm4_output_finish);
 10.2518 -+			      skb->dst->dev, xfrm4_output_finish2);
 10.2519 - 		if (unlikely(err != 1))
 10.2520 - 			break;
 10.2521 - 	}
 10.2522 -@@ -188,6 +184,48 @@
 10.2523 - 	return err;
 10.2524 - }
 10.2525 - 
 10.2526 -+static int xfrm4_output_finish(struct sk_buff *skb)
 10.2527 -+{
 10.2528 -+	struct sk_buff *segs;
 10.2529 -+
 10.2530 -+#ifdef CONFIG_NETFILTER
 10.2531 -+	if (!skb->dst->xfrm) {
 10.2532 -+		IPCB(skb)->flags |= IPSKB_REROUTED;
 10.2533 -+		return dst_output(skb);
 10.2534 -+	}
 10.2535 -+#endif
 10.2536 -+
 10.2537 -+	if (!skb_shinfo(skb)->gso_size)
 10.2538 -+		return xfrm4_output_finish2(skb);
 10.2539 -+
 10.2540 -+	skb->protocol = htons(ETH_P_IP);
 10.2541 -+	segs = skb_gso_segment(skb, 0);
 10.2542 -+	kfree_skb(skb);
 10.2543 -+	if (unlikely(IS_ERR(segs)))
 10.2544 -+		return PTR_ERR(segs);
 10.2545 -+
 10.2546 -+	do {
 10.2547 -+		struct sk_buff *nskb = segs->next;
 10.2548 -+		int err;
 10.2549 -+
 10.2550 -+		segs->next = NULL;
 10.2551 -+		err = xfrm4_output_finish2(segs);
 10.2552 -+
 10.2553 -+		if (unlikely(err)) {
 10.2554 -+			while ((segs = nskb)) {
 10.2555 -+				nskb = segs->next;
 10.2556 -+				segs->next = NULL;
 10.2557 -+				kfree_skb(segs);
 10.2558 -+			}
 10.2559 -+			return err;
 10.2560 -+		}
 10.2561 -+
 10.2562 -+		segs = nskb;
 10.2563 -+	} while (segs);
 10.2564 -+
 10.2565 -+	return 0;
 10.2566 -+}
 10.2567 -+
 10.2568 - int xfrm4_output(struct sk_buff *skb)
 10.2569 - {
 10.2570 - 	return NF_HOOK_COND(PF_INET, NF_IP_POST_ROUTING, skb, NULL, skb->dst->dev,
 10.2571 -Index: tmp-xxx/net/ipv6/ip6_output.c
 10.2572 -===================================================================
 10.2573 ---- tmp-xxx.orig/net/ipv6/ip6_output.c	2006-11-15 10:38:39.000000000 +0000
 10.2574 -+++ tmp-xxx/net/ipv6/ip6_output.c	2006-11-27 10:52:42.000000000 +0000
 10.2575 -@@ -147,7 +147,7 @@
 10.2576 - 
 10.2577 - int ip6_output(struct sk_buff *skb)
 10.2578 - {
 10.2579 --	if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->ufo_size) ||
 10.2580 -+	if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size) ||
 10.2581 - 				dst_allfrag(skb->dst))
 10.2582 - 		return ip6_fragment(skb, ip6_output2);
 10.2583 - 	else
 10.2584 -@@ -829,8 +829,9 @@
 10.2585 - 		struct frag_hdr fhdr;
 10.2586 - 
 10.2587 - 		/* specify the length of each IP datagram fragment*/
 10.2588 --		skb_shinfo(skb)->ufo_size = (mtu - fragheaderlen) - 
 10.2589 --						sizeof(struct frag_hdr);
 10.2590 -+		skb_shinfo(skb)->gso_size = mtu - fragheaderlen - 
 10.2591 -+					    sizeof(struct frag_hdr);
 10.2592 -+		skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4;
 10.2593 - 		ipv6_select_ident(skb, &fhdr);
 10.2594 - 		skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
 10.2595 - 		__skb_queue_tail(&sk->sk_write_queue, skb);
 10.2596 -Index: tmp-xxx/net/ipv6/ipcomp6.c
 10.2597 -===================================================================
 10.2598 ---- tmp-xxx.orig/net/ipv6/ipcomp6.c	2006-11-15 10:38:39.000000000 +0000
 10.2599 -+++ tmp-xxx/net/ipv6/ipcomp6.c	2006-11-27 10:52:42.000000000 +0000
 10.2600 -@@ -64,7 +64,7 @@
 10.2601 - 
 10.2602 - static int ipcomp6_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb)
 10.2603 - {
 10.2604 --	int err = 0;
 10.2605 -+	int err = -ENOMEM;
 10.2606 - 	u8 nexthdr = 0;
 10.2607 - 	int hdr_len = skb->h.raw - skb->nh.raw;
 10.2608 - 	unsigned char *tmp_hdr = NULL;
 10.2609 -@@ -75,11 +75,8 @@
 10.2610 - 	struct crypto_tfm *tfm;
 10.2611 - 	int cpu;
 10.2612 - 
 10.2613 --	if ((skb_is_nonlinear(skb) || skb_cloned(skb)) &&
 10.2614 --		skb_linearize(skb, GFP_ATOMIC) != 0) {
 10.2615 --		err = -ENOMEM;
 10.2616 -+	if (skb_linearize_cow(skb))
 10.2617 - 		goto out;
 10.2618 --	}
 10.2619 - 
 10.2620 - 	skb->ip_summed = CHECKSUM_NONE;
 10.2621 - 
 10.2622 -@@ -158,10 +155,8 @@
 10.2623 - 		goto out_ok;
 10.2624 - 	}
 10.2625 - 
 10.2626 --	if ((skb_is_nonlinear(skb) || skb_cloned(skb)) &&
 10.2627 --		skb_linearize(skb, GFP_ATOMIC) != 0) {
 10.2628 -+	if (skb_linearize_cow(skb))
 10.2629 - 		goto out_ok;
 10.2630 --	}
 10.2631 - 
 10.2632 - 	/* compression */
 10.2633 - 	plen = skb->len - hdr_len;
 10.2634 -Index: tmp-xxx/net/ipv6/xfrm6_output.c
 10.2635 -===================================================================
 10.2636 ---- tmp-xxx.orig/net/ipv6/xfrm6_output.c	2006-11-15 10:38:39.000000000 +0000
 10.2637 -+++ tmp-xxx/net/ipv6/xfrm6_output.c	2006-11-27 10:52:42.000000000 +0000
 10.2638 -@@ -151,7 +151,7 @@
 10.2639 - 	goto out_exit;
 10.2640 - }
 10.2641 - 
 10.2642 --static int xfrm6_output_finish(struct sk_buff *skb)
 10.2643 -+static int xfrm6_output_finish2(struct sk_buff *skb)
 10.2644 - {
 10.2645 - 	int err;
 10.2646 - 
 10.2647 -@@ -167,7 +167,7 @@
 10.2648 - 			return dst_output(skb);
 10.2649 - 
 10.2650 - 		err = nf_hook(PF_INET6, NF_IP6_POST_ROUTING, &skb, NULL,
 10.2651 --			      skb->dst->dev, xfrm6_output_finish);
 10.2652 -+			      skb->dst->dev, xfrm6_output_finish2);
 10.2653 - 		if (unlikely(err != 1))
 10.2654 - 			break;
 10.2655 - 	}
 10.2656 -@@ -175,6 +175,41 @@
 10.2657 - 	return err;
 10.2658 - }
 10.2659 - 
 10.2660 -+static int xfrm6_output_finish(struct sk_buff *skb)
 10.2661 -+{
 10.2662 -+	struct sk_buff *segs;
 10.2663 -+
 10.2664 -+	if (!skb_shinfo(skb)->gso_size)
 10.2665 -+		return xfrm6_output_finish2(skb);
 10.2666 -+
 10.2667 -+	skb->protocol = htons(ETH_P_IP);
 10.2668 -+	segs = skb_gso_segment(skb, 0);
 10.2669 -+	kfree_skb(skb);
 10.2670 -+	if (unlikely(IS_ERR(segs)))
 10.2671 -+		return PTR_ERR(segs);
 10.2672 -+
 10.2673 -+	do {
 10.2674 -+		struct sk_buff *nskb = segs->next;
 10.2675 -+		int err;
 10.2676 -+
 10.2677 -+		segs->next = NULL;
 10.2678 -+		err = xfrm6_output_finish2(segs);
 10.2679 -+
 10.2680 -+		if (unlikely(err)) {
 10.2681 -+			while ((segs = nskb)) {
 10.2682 -+				nskb = segs->next;
 10.2683 -+				segs->next = NULL;
 10.2684 -+				kfree_skb(segs);
 10.2685 -+			}
 10.2686 -+			return err;
 10.2687 -+		}
 10.2688 -+
 10.2689 -+		segs = nskb;
 10.2690 -+	} while (segs);
 10.2691 -+
 10.2692 -+	return 0;
 10.2693 -+}
 10.2694 -+
 10.2695 - int xfrm6_output(struct sk_buff *skb)
 10.2696 - {
 10.2697 - 	return NF_HOOK(PF_INET6, NF_IP6_POST_ROUTING, skb, NULL, skb->dst->dev,
 10.2698 -Index: tmp-xxx/net/sched/sch_generic.c
 10.2699 -===================================================================
 10.2700 ---- tmp-xxx.orig/net/sched/sch_generic.c	2006-11-15 10:38:39.000000000 +0000
 10.2701 -+++ tmp-xxx/net/sched/sch_generic.c	2006-11-27 10:52:42.000000000 +0000
 10.2702 -@@ -72,9 +72,9 @@
 10.2703 -    dev->queue_lock serializes queue accesses for this device
 10.2704 -    AND dev->qdisc pointer itself.
 10.2705 - 
 10.2706 --   dev->xmit_lock serializes accesses to device driver.
 10.2707 -+   netif_tx_lock serializes accesses to device driver.
 10.2708 - 
 10.2709 --   dev->queue_lock and dev->xmit_lock are mutually exclusive,
 10.2710 -+   dev->queue_lock and netif_tx_lock are mutually exclusive,
 10.2711 -    if one is grabbed, another must be free.
 10.2712 -  */
 10.2713 - 
 10.2714 -@@ -90,14 +90,17 @@
 10.2715 -    NOTE: Called under dev->queue_lock with locally disabled BH.
 10.2716 - */
 10.2717 - 
 10.2718 --int qdisc_restart(struct net_device *dev)
 10.2719 -+static inline int qdisc_restart(struct net_device *dev)
 10.2720 - {
 10.2721 - 	struct Qdisc *q = dev->qdisc;
 10.2722 - 	struct sk_buff *skb;
 10.2723 - 
 10.2724 - 	/* Dequeue packet */
 10.2725 --	if ((skb = q->dequeue(q)) != NULL) {
 10.2726 -+	if (((skb = dev->gso_skb)) || ((skb = q->dequeue(q)))) {
 10.2727 - 		unsigned nolock = (dev->features & NETIF_F_LLTX);
 10.2728 -+
 10.2729 -+		dev->gso_skb = NULL;
 10.2730 -+
 10.2731 - 		/*
 10.2732 - 		 * When the driver has LLTX set it does its own locking
 10.2733 - 		 * in start_xmit. No need to add additional overhead by
 10.2734 -@@ -108,7 +111,7 @@
 10.2735 - 		 * will be requeued.
 10.2736 - 		 */
 10.2737 - 		if (!nolock) {
 10.2738 --			if (!spin_trylock(&dev->xmit_lock)) {
 10.2739 -+			if (!netif_tx_trylock(dev)) {
 10.2740 - 			collision:
 10.2741 - 				/* So, someone grabbed the driver. */
 10.2742 - 				
 10.2743 -@@ -126,8 +129,6 @@
 10.2744 - 				__get_cpu_var(netdev_rx_stat).cpu_collision++;
 10.2745 - 				goto requeue;
 10.2746 - 			}
 10.2747 --			/* Remember that the driver is grabbed by us. */
 10.2748 --			dev->xmit_lock_owner = smp_processor_id();
 10.2749 - 		}
 10.2750 - 		
 10.2751 - 		{
 10.2752 -@@ -136,14 +137,11 @@
 10.2753 - 
 10.2754 - 			if (!netif_queue_stopped(dev)) {
 10.2755 - 				int ret;
 10.2756 --				if (netdev_nit)
 10.2757 --					dev_queue_xmit_nit(skb, dev);
 10.2758 - 
 10.2759 --				ret = dev->hard_start_xmit(skb, dev);
 10.2760 -+				ret = dev_hard_start_xmit(skb, dev);
 10.2761 - 				if (ret == NETDEV_TX_OK) { 
 10.2762 - 					if (!nolock) {
 10.2763 --						dev->xmit_lock_owner = -1;
 10.2764 --						spin_unlock(&dev->xmit_lock);
 10.2765 -+						netif_tx_unlock(dev);
 10.2766 - 					}
 10.2767 - 					spin_lock(&dev->queue_lock);
 10.2768 - 					return -1;
 10.2769 -@@ -157,8 +155,7 @@
 10.2770 - 			/* NETDEV_TX_BUSY - we need to requeue */
 10.2771 - 			/* Release the driver */
 10.2772 - 			if (!nolock) { 
 10.2773 --				dev->xmit_lock_owner = -1;
 10.2774 --				spin_unlock(&dev->xmit_lock);
 10.2775 -+				netif_tx_unlock(dev);
 10.2776 - 			} 
 10.2777 - 			spin_lock(&dev->queue_lock);
 10.2778 - 			q = dev->qdisc;
 10.2779 -@@ -175,7 +172,10 @@
 10.2780 - 		 */
 10.2781 - 
 10.2782 - requeue:
 10.2783 --		q->ops->requeue(skb, q);
 10.2784 -+		if (skb->next)
 10.2785 -+			dev->gso_skb = skb;
 10.2786 -+		else
 10.2787 -+			q->ops->requeue(skb, q);
 10.2788 - 		netif_schedule(dev);
 10.2789 - 		return 1;
 10.2790 - 	}
 10.2791 -@@ -183,11 +183,23 @@
 10.2792 - 	return q->q.qlen;
 10.2793 - }
 10.2794 - 
 10.2795 -+void __qdisc_run(struct net_device *dev)
 10.2796 -+{
 10.2797 -+	if (unlikely(dev->qdisc == &noop_qdisc))
 10.2798 -+		goto out;
 10.2799 -+
 10.2800 -+	while (qdisc_restart(dev) < 0 && !netif_queue_stopped(dev))
 10.2801 -+		/* NOTHING */;
 10.2802 -+
 10.2803 -+out:
 10.2804 -+	clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
 10.2805 -+}
 10.2806 -+
 10.2807 - static void dev_watchdog(unsigned long arg)
 10.2808 - {
 10.2809 - 	struct net_device *dev = (struct net_device *)arg;
 10.2810 - 
 10.2811 --	spin_lock(&dev->xmit_lock);
 10.2812 -+	netif_tx_lock(dev);
 10.2813 - 	if (dev->qdisc != &noop_qdisc) {
 10.2814 - 		if (netif_device_present(dev) &&
 10.2815 - 		    netif_running(dev) &&
 10.2816 -@@ -201,7 +213,7 @@
 10.2817 - 				dev_hold(dev);
 10.2818 - 		}
 10.2819 - 	}
 10.2820 --	spin_unlock(&dev->xmit_lock);
 10.2821 -+	netif_tx_unlock(dev);
 10.2822 - 
 10.2823 - 	dev_put(dev);
 10.2824 - }
 10.2825 -@@ -225,17 +237,17 @@
 10.2826 - 
 10.2827 - static void dev_watchdog_up(struct net_device *dev)
 10.2828 - {
 10.2829 --	spin_lock_bh(&dev->xmit_lock);
 10.2830 -+	netif_tx_lock_bh(dev);
 10.2831 - 	__netdev_watchdog_up(dev);
 10.2832 --	spin_unlock_bh(&dev->xmit_lock);
 10.2833 -+	netif_tx_unlock_bh(dev);
 10.2834 - }
 10.2835 - 
 10.2836 - static void dev_watchdog_down(struct net_device *dev)
 10.2837 - {
 10.2838 --	spin_lock_bh(&dev->xmit_lock);
 10.2839 -+	netif_tx_lock_bh(dev);
 10.2840 - 	if (del_timer(&dev->watchdog_timer))
 10.2841 - 		__dev_put(dev);
 10.2842 --	spin_unlock_bh(&dev->xmit_lock);
 10.2843 -+	netif_tx_unlock_bh(dev);
 10.2844 - }
 10.2845 - 
 10.2846 - void netif_carrier_on(struct net_device *dev)
 10.2847 -@@ -577,10 +589,17 @@
 10.2848 - 
 10.2849 - 	dev_watchdog_down(dev);
 10.2850 - 
 10.2851 --	while (test_bit(__LINK_STATE_SCHED, &dev->state))
 10.2852 -+	/* Wait for outstanding dev_queue_xmit calls. */
 10.2853 -+	synchronize_rcu();
 10.2854 -+
 10.2855 -+	/* Wait for outstanding qdisc_run calls. */
 10.2856 -+	while (test_bit(__LINK_STATE_QDISC_RUNNING, &dev->state))
 10.2857 - 		yield();
 10.2858 - 
 10.2859 --	spin_unlock_wait(&dev->xmit_lock);
 10.2860 -+	if (dev->gso_skb) {
 10.2861 -+		kfree_skb(dev->gso_skb);
 10.2862 -+		dev->gso_skb = NULL;
 10.2863 -+	}
 10.2864 - }
 10.2865 - 
 10.2866 - void dev_init_scheduler(struct net_device *dev)
 10.2867 -@@ -622,6 +641,5 @@
 10.2868 - EXPORT_SYMBOL(qdisc_alloc);
 10.2869 - EXPORT_SYMBOL(qdisc_destroy);
 10.2870 - EXPORT_SYMBOL(qdisc_reset);
 10.2871 --EXPORT_SYMBOL(qdisc_restart);
 10.2872 - EXPORT_SYMBOL(qdisc_lock_tree);
 10.2873 - EXPORT_SYMBOL(qdisc_unlock_tree);
 10.2874 -Index: tmp-xxx/net/sched/sch_teql.c
 10.2875 -===================================================================
 10.2876 ---- tmp-xxx.orig/net/sched/sch_teql.c	2006-11-15 10:38:39.000000000 +0000
 10.2877 -+++ tmp-xxx/net/sched/sch_teql.c	2006-11-27 10:52:42.000000000 +0000
 10.2878 -@@ -302,20 +302,17 @@
 10.2879 - 
 10.2880 - 		switch (teql_resolve(skb, skb_res, slave)) {
 10.2881 - 		case 0:
 10.2882 --			if (spin_trylock(&slave->xmit_lock)) {
 10.2883 --				slave->xmit_lock_owner = smp_processor_id();
 10.2884 -+			if (netif_tx_trylock(slave)) {
 10.2885 - 				if (!netif_queue_stopped(slave) &&
 10.2886 - 				    slave->hard_start_xmit(skb, slave) == 0) {
 10.2887 --					slave->xmit_lock_owner = -1;
 10.2888 --					spin_unlock(&slave->xmit_lock);
 10.2889 -+					netif_tx_unlock(slave);
 10.2890 - 					master->slaves = NEXT_SLAVE(q);
 10.2891 - 					netif_wake_queue(dev);
 10.2892 - 					master->stats.tx_packets++;
 10.2893 - 					master->stats.tx_bytes += len;
 10.2894 - 					return 0;
 10.2895 - 				}
 10.2896 --				slave->xmit_lock_owner = -1;
 10.2897 --				spin_unlock(&slave->xmit_lock);
 10.2898 -+				netif_tx_unlock(slave);
 10.2899 - 			}
 10.2900 - 			if (netif_queue_stopped(dev))
 10.2901 - 				busy = 1;

    11.1 --- a/patches/linux-2.6.16.32/net-gso-1-check-dodgy.patch	Tue Nov 28 14:27:13 2006 +0000
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,27 +0,0 @@
    11.4 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/tcp.c ./net/ipv4/tcp.c
    11.5 ---- ../orig-linux-2.6.16.29/net/ipv4/tcp.c	2006-09-19 13:59:20.000000000 +0100
    11.6 -+++ ./net/ipv4/tcp.c	2006-09-19 13:59:42.000000000 +0100
    11.7 -@@ -2042,13 +2042,19 @@ struct sk_buff *tcp_tso_segment(struct s
    11.8 - 	if (!pskb_may_pull(skb, thlen))
    11.9 - 		goto out;
   11.10 - 
   11.11 --	segs = NULL;
   11.12 --	if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST))
   11.13 --		goto out;
   11.14 --
   11.15 - 	oldlen = (u16)~skb->len;
   11.16 - 	__skb_pull(skb, thlen);
   11.17 - 
   11.18 -+	if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) {
   11.19 -+		/* Packet is from an untrusted source, reset gso_segs. */
   11.20 -+		int mss = skb_shinfo(skb)->gso_size;
   11.21 -+
   11.22 -+		skb_shinfo(skb)->gso_segs = (skb->len + mss - 1) / mss;
   11.23 -+
   11.24 -+		segs = NULL;
   11.25 -+		goto out;
   11.26 -+	}
   11.27 -+
   11.28 - 	segs = skb_segment(skb, features);
   11.29 - 	if (IS_ERR(segs))
   11.30 - 		goto out;

    12.1 --- a/patches/linux-2.6.16.32/net-gso-2-checksum-fix.patch	Tue Nov 28 14:27:13 2006 +0000
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,451 +0,0 @@
    12.4 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/bnx2.c ./drivers/net/bnx2.c
    12.5 ---- ../orig-linux-2.6.16.29/drivers/net/bnx2.c	2006-09-19 13:59:20.000000000 +0100
    12.6 -+++ ./drivers/net/bnx2.c	2006-09-19 13:59:46.000000000 +0100
    12.7 -@@ -1593,7 +1593,7 @@ bnx2_tx_int(struct bnx2 *bp)
    12.8 - 		skb = tx_buf->skb;
    12.9 - #ifdef BCM_TSO 
   12.10 - 		/* partial BD completions possible with TSO packets */
   12.11 --		if (skb_shinfo(skb)->gso_size) {
   12.12 -+		if (skb_is_gso(skb)) {
   12.13 - 			u16 last_idx, last_ring_idx;
   12.14 - 
   12.15 - 			last_idx = sw_cons +
   12.16 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/chelsio/sge.c ./drivers/net/chelsio/sge.c
   12.17 ---- ../orig-linux-2.6.16.29/drivers/net/chelsio/sge.c	2006-09-19 13:59:20.000000000 +0100
   12.18 -+++ ./drivers/net/chelsio/sge.c	2006-09-19 13:59:46.000000000 +0100
   12.19 -@@ -1419,7 +1419,7 @@ int t1_start_xmit(struct sk_buff *skb, s
   12.20 - 	struct cpl_tx_pkt *cpl;
   12.21 - 
   12.22 - #ifdef NETIF_F_TSO
   12.23 --	if (skb_shinfo(skb)->gso_size) {
   12.24 -+	if (skb_is_gso(skb)) {
   12.25 - 		int eth_type;
   12.26 - 		struct cpl_tx_pkt_lso *hdr;
   12.27 - 
   12.28 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/e1000/e1000_main.c ./drivers/net/e1000/e1000_main.c
   12.29 ---- ../orig-linux-2.6.16.29/drivers/net/e1000/e1000_main.c	2006-09-19 13:59:20.000000000 +0100
   12.30 -+++ ./drivers/net/e1000/e1000_main.c	2006-09-19 13:59:46.000000000 +0100
   12.31 -@@ -2526,7 +2526,7 @@ e1000_tso(struct e1000_adapter *adapter,
   12.32 - 	uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
   12.33 - 	int err;
   12.34 - 
   12.35 --	if (skb_shinfo(skb)->gso_size) {
   12.36 -+	if (skb_is_gso(skb)) {
   12.37 - 		if (skb_header_cloned(skb)) {
   12.38 - 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
   12.39 - 			if (err)
   12.40 -@@ -2651,7 +2651,7 @@ e1000_tx_map(struct e1000_adapter *adapt
   12.41 - 		 * tso gets written back prematurely before the data is fully
   12.42 - 		 * DMAd to the controller */
   12.43 - 		if (!skb->data_len && tx_ring->last_tx_tso &&
   12.44 --				!skb_shinfo(skb)->gso_size) {
   12.45 -+		    !skb_is_gso(skb)) {
   12.46 - 			tx_ring->last_tx_tso = 0;
   12.47 - 			size -= 4;
   12.48 - 		}
   12.49 -@@ -2934,8 +2934,7 @@ e1000_xmit_frame(struct sk_buff *skb, st
   12.50 - 
   12.51 - #ifdef NETIF_F_TSO
   12.52 - 	/* Controller Erratum workaround */
   12.53 --	if (!skb->data_len && tx_ring->last_tx_tso &&
   12.54 --		!skb_shinfo(skb)->gso_size)
   12.55 -+	if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
   12.56 - 		count++;
   12.57 - #endif
   12.58 - 
   12.59 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/forcedeth.c ./drivers/net/forcedeth.c
   12.60 ---- ../orig-linux-2.6.16.29/drivers/net/forcedeth.c	2006-09-19 13:59:20.000000000 +0100
   12.61 -+++ ./drivers/net/forcedeth.c	2006-09-19 13:59:46.000000000 +0100
   12.62 -@@ -1105,7 +1105,7 @@ static int nv_start_xmit(struct sk_buff 
   12.63 - 	np->tx_skbuff[nr] = skb;
   12.64 - 
   12.65 - #ifdef NETIF_F_TSO
   12.66 --	if (skb_shinfo(skb)->gso_size)
   12.67 -+	if (skb_is_gso(skb))
   12.68 - 		tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT);
   12.69 - 	else
   12.70 - #endif
   12.71 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/ixgb/ixgb_main.c ./drivers/net/ixgb/ixgb_main.c
   12.72 ---- ../orig-linux-2.6.16.29/drivers/net/ixgb/ixgb_main.c	2006-09-19 13:59:20.000000000 +0100
   12.73 -+++ ./drivers/net/ixgb/ixgb_main.c	2006-09-19 13:59:46.000000000 +0100
   12.74 -@@ -1163,7 +1163,7 @@ ixgb_tso(struct ixgb_adapter *adapter, s
   12.75 - 	uint16_t ipcse, tucse, mss;
   12.76 - 	int err;
   12.77 - 
   12.78 --	if(likely(skb_shinfo(skb)->gso_size)) {
   12.79 -+	if (likely(skb_is_gso(skb))) {
   12.80 - 		if (skb_header_cloned(skb)) {
   12.81 - 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
   12.82 - 			if (err)
   12.83 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/loopback.c ./drivers/net/loopback.c
   12.84 ---- ../orig-linux-2.6.16.29/drivers/net/loopback.c	2006-09-19 13:59:20.000000000 +0100
   12.85 -+++ ./drivers/net/loopback.c	2006-09-19 13:59:46.000000000 +0100
   12.86 -@@ -139,7 +139,7 @@ static int loopback_xmit(struct sk_buff 
   12.87 - #endif
   12.88 - 
   12.89 - #ifdef LOOPBACK_TSO
   12.90 --	if (skb_shinfo(skb)->gso_size) {
   12.91 -+	if (skb_is_gso(skb)) {
   12.92 - 		BUG_ON(skb->protocol != htons(ETH_P_IP));
   12.93 - 		BUG_ON(skb->nh.iph->protocol != IPPROTO_TCP);
   12.94 - 
   12.95 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/sky2.c ./drivers/net/sky2.c
   12.96 ---- ../orig-linux-2.6.16.29/drivers/net/sky2.c	2006-09-19 13:59:20.000000000 +0100
   12.97 -+++ ./drivers/net/sky2.c	2006-09-19 13:59:46.000000000 +0100
   12.98 -@@ -1125,7 +1125,7 @@ static unsigned tx_le_req(const struct s
   12.99 - 	count = sizeof(dma_addr_t) / sizeof(u32);
  12.100 - 	count += skb_shinfo(skb)->nr_frags * count;
  12.101 - 
  12.102 --	if (skb_shinfo(skb)->gso_size)
  12.103 -+	if (skb_is_gso(skb))
  12.104 - 		++count;
  12.105 - 
  12.106 - 	if (skb->ip_summed == CHECKSUM_HW)
  12.107 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/typhoon.c ./drivers/net/typhoon.c
  12.108 ---- ../orig-linux-2.6.16.29/drivers/net/typhoon.c	2006-09-19 13:59:20.000000000 +0100
  12.109 -+++ ./drivers/net/typhoon.c	2006-09-19 13:59:46.000000000 +0100
  12.110 -@@ -805,7 +805,7 @@ typhoon_start_tx(struct sk_buff *skb, st
  12.111 - 	 * If problems develop with TSO, check this first.
  12.112 - 	 */
  12.113 - 	numDesc = skb_shinfo(skb)->nr_frags + 1;
  12.114 --	if(skb_tso_size(skb))
  12.115 -+	if (skb_is_gso(skb))
  12.116 - 		numDesc++;
  12.117 - 
  12.118 - 	/* When checking for free space in the ring, we need to also
  12.119 -@@ -845,7 +845,7 @@ typhoon_start_tx(struct sk_buff *skb, st
  12.120 - 				TYPHOON_TX_PF_VLAN_TAG_SHIFT);
  12.121 - 	}
  12.122 - 
  12.123 --	if(skb_tso_size(skb)) {
  12.124 -+	if (skb_is_gso(skb)) {
  12.125 - 		first_txd->processFlags |= TYPHOON_TX_PF_TCP_SEGMENT;
  12.126 - 		first_txd->numDesc++;
  12.127 - 
  12.128 -diff -pruN ../orig-linux-2.6.16.29/drivers/s390/net/qeth_main.c ./drivers/s390/net/qeth_main.c
  12.129 ---- ../orig-linux-2.6.16.29/drivers/s390/net/qeth_main.c	2006-09-19 13:59:20.000000000 +0100
  12.130 -+++ ./drivers/s390/net/qeth_main.c	2006-09-19 13:59:46.000000000 +0100
  12.131 -@@ -4454,7 +4454,7 @@ qeth_send_packet(struct qeth_card *card,
  12.132 - 	queue = card->qdio.out_qs
  12.133 - 		[qeth_get_priority_queue(card, skb, ipv, cast_type)];
  12.134 - 
  12.135 --	if (skb_shinfo(skb)->gso_size)
  12.136 -+	if (skb_is_gso(skb))
  12.137 - 		large_send = card->options.large_send;
  12.138 - 
  12.139 - 	/*are we able to do TSO ? If so ,prepare and send it from here */
  12.140 -@@ -4501,8 +4501,7 @@ qeth_send_packet(struct qeth_card *card,
  12.141 - 		card->stats.tx_packets++;
  12.142 - 		card->stats.tx_bytes += skb->len;
  12.143 - #ifdef CONFIG_QETH_PERF_STATS
  12.144 --		if (skb_shinfo(skb)->gso_size &&
  12.145 --		   !(large_send == QETH_LARGE_SEND_NO)) {
  12.146 -+		if (skb_is_gso(skb) && !(large_send == QETH_LARGE_SEND_NO)) {
  12.147 - 			card->perf_stats.large_send_bytes += skb->len;
  12.148 - 			card->perf_stats.large_send_cnt++;
  12.149 - 		}
  12.150 -diff -pruN ../orig-linux-2.6.16.29/include/linux/netdevice.h ./include/linux/netdevice.h
  12.151 ---- ../orig-linux-2.6.16.29/include/linux/netdevice.h	2006-09-19 13:59:20.000000000 +0100
  12.152 -+++ ./include/linux/netdevice.h	2006-09-19 13:59:46.000000000 +0100
  12.153 -@@ -541,6 +541,7 @@ struct packet_type {
  12.154 - 					 struct net_device *);
  12.155 - 	struct sk_buff		*(*gso_segment)(struct sk_buff *skb,
  12.156 - 						int features);
  12.157 -+	int			(*gso_send_check)(struct sk_buff *skb);
  12.158 - 	void			*af_packet_priv;
  12.159 - 	struct list_head	list;
  12.160 - };
  12.161 -@@ -1001,14 +1002,15 @@ extern void linkwatch_run_queue(void);
  12.162 - 
  12.163 - static inline int skb_gso_ok(struct sk_buff *skb, int features)
  12.164 - {
  12.165 --	int feature = skb_shinfo(skb)->gso_size ?
  12.166 --		      skb_shinfo(skb)->gso_type << NETIF_F_GSO_SHIFT : 0;
  12.167 -+	int feature = skb_shinfo(skb)->gso_type << NETIF_F_GSO_SHIFT;
  12.168 - 	return (features & feature) == feature;
  12.169 - }
  12.170 - 
  12.171 - static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
  12.172 - {
  12.173 --	return !skb_gso_ok(skb, dev->features);
  12.174 -+	return skb_is_gso(skb) &&
  12.175 -+	       (!skb_gso_ok(skb, dev->features) ||
  12.176 -+		unlikely(skb->ip_summed != CHECKSUM_HW));
  12.177 - }
  12.178 - 
  12.179 - #endif /* __KERNEL__ */
  12.180 -diff -pruN ../orig-linux-2.6.16.29/include/linux/skbuff.h ./include/linux/skbuff.h
  12.181 ---- ../orig-linux-2.6.16.29/include/linux/skbuff.h	2006-09-19 13:59:20.000000000 +0100
  12.182 -+++ ./include/linux/skbuff.h	2006-09-19 13:59:46.000000000 +0100
  12.183 -@@ -1403,5 +1403,10 @@ static inline void nf_bridge_get(struct 
  12.184 - static inline void nf_reset(struct sk_buff *skb) {}
  12.185 - #endif /* CONFIG_NETFILTER */
  12.186 - 
  12.187 -+static inline int skb_is_gso(const struct sk_buff *skb)
  12.188 -+{
  12.189 -+	return skb_shinfo(skb)->gso_size;
  12.190 -+}
  12.191 -+
  12.192 - #endif	/* __KERNEL__ */
  12.193 - #endif	/* _LINUX_SKBUFF_H */
  12.194 -diff -pruN ../orig-linux-2.6.16.29/include/net/protocol.h ./include/net/protocol.h
  12.195 ---- ../orig-linux-2.6.16.29/include/net/protocol.h	2006-09-19 13:59:20.000000000 +0100
  12.196 -+++ ./include/net/protocol.h	2006-09-19 13:59:46.000000000 +0100
  12.197 -@@ -37,6 +37,7 @@
  12.198 - struct net_protocol {
  12.199 - 	int			(*handler)(struct sk_buff *skb);
  12.200 - 	void			(*err_handler)(struct sk_buff *skb, u32 info);
  12.201 -+	int			(*gso_send_check)(struct sk_buff *skb);
  12.202 - 	struct sk_buff	       *(*gso_segment)(struct sk_buff *skb,
  12.203 - 					       int features);
  12.204 - 	int			no_policy;
  12.205 -diff -pruN ../orig-linux-2.6.16.29/include/net/tcp.h ./include/net/tcp.h
  12.206 ---- ../orig-linux-2.6.16.29/include/net/tcp.h	2006-09-19 13:59:20.000000000 +0100
  12.207 -+++ ./include/net/tcp.h	2006-09-19 13:59:46.000000000 +0100
  12.208 -@@ -1063,6 +1063,7 @@ extern struct request_sock_ops tcp_reque
  12.209 - 
  12.210 - extern int tcp_v4_destroy_sock(struct sock *sk);
  12.211 - 
  12.212 -+extern int tcp_v4_gso_send_check(struct sk_buff *skb);
  12.213 - extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features);
  12.214 - 
  12.215 - #ifdef CONFIG_PROC_FS
  12.216 -diff -pruN ../orig-linux-2.6.16.29/net/bridge/br_forward.c ./net/bridge/br_forward.c
  12.217 ---- ../orig-linux-2.6.16.29/net/bridge/br_forward.c	2006-09-19 13:59:20.000000000 +0100
  12.218 -+++ ./net/bridge/br_forward.c	2006-09-19 13:59:46.000000000 +0100
  12.219 -@@ -32,7 +32,7 @@ static inline int should_deliver(const s
  12.220 - int br_dev_queue_push_xmit(struct sk_buff *skb)
  12.221 - {
  12.222 - 	/* drop mtu oversized packets except tso */
  12.223 --	if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->gso_size)
  12.224 -+	if (skb->len > skb->dev->mtu && !skb_is_gso(skb))
  12.225 - 		kfree_skb(skb);
  12.226 - 	else {
  12.227 - #ifdef CONFIG_BRIDGE_NETFILTER
  12.228 -diff -pruN ../orig-linux-2.6.16.29/net/bridge/br_netfilter.c ./net/bridge/br_netfilter.c
  12.229 ---- ../orig-linux-2.6.16.29/net/bridge/br_netfilter.c	2006-09-19 13:59:20.000000000 +0100
  12.230 -+++ ./net/bridge/br_netfilter.c	2006-09-19 13:59:46.000000000 +0100
  12.231 -@@ -743,7 +743,7 @@ static int br_nf_dev_queue_xmit(struct s
  12.232 - {
  12.233 - 	if (skb->protocol == htons(ETH_P_IP) &&
  12.234 - 	    skb->len > skb->dev->mtu &&
  12.235 --	    !skb_shinfo(skb)->gso_size)
  12.236 -+	    !skb_is_gso(skb))
  12.237 - 		return ip_fragment(skb, br_dev_queue_push_xmit);
  12.238 - 	else
  12.239 - 		return br_dev_queue_push_xmit(skb);
  12.240 -diff -pruN ../orig-linux-2.6.16.29/net/core/dev.c ./net/core/dev.c
  12.241 ---- ../orig-linux-2.6.16.29/net/core/dev.c	2006-09-19 13:59:20.000000000 +0100
  12.242 -+++ ./net/core/dev.c	2006-09-19 13:59:46.000000000 +0100
  12.243 -@@ -1083,9 +1083,17 @@ int skb_checksum_help(struct sk_buff *sk
  12.244 - 	unsigned int csum;
  12.245 - 	int ret = 0, offset = skb->h.raw - skb->data;
  12.246 - 
  12.247 --	if (inward) {
  12.248 --		skb->ip_summed = CHECKSUM_NONE;
  12.249 --		goto out;
  12.250 -+	if (inward)
  12.251 -+		goto out_set_summed;
  12.252 -+
  12.253 -+	if (unlikely(skb_shinfo(skb)->gso_size)) {
  12.254 -+		static int warned;
  12.255 -+
  12.256 -+		WARN_ON(!warned);
  12.257 -+		warned = 1;
  12.258 -+
  12.259 -+		/* Let GSO fix up the checksum. */
  12.260 -+		goto out_set_summed;
  12.261 - 	}
  12.262 - 
  12.263 - 	if (skb_cloned(skb)) {
  12.264 -@@ -1102,6 +1110,8 @@ int skb_checksum_help(struct sk_buff *sk
  12.265 - 	BUG_ON(skb->csum + 2 > offset);
  12.266 - 
  12.267 - 	*(u16*)(skb->h.raw + skb->csum) = csum_fold(csum);
  12.268 -+
  12.269 -+out_set_summed:
  12.270 - 	skb->ip_summed = CHECKSUM_NONE;
  12.271 - out:	
  12.272 - 	return ret;
  12.273 -@@ -1122,17 +1132,35 @@ struct sk_buff *skb_gso_segment(struct s
  12.274 - 	struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);
  12.275 - 	struct packet_type *ptype;
  12.276 - 	int type = skb->protocol;
  12.277 -+	int err;
  12.278 - 
  12.279 - 	BUG_ON(skb_shinfo(skb)->frag_list);
  12.280 --	BUG_ON(skb->ip_summed != CHECKSUM_HW);
  12.281 - 
  12.282 - 	skb->mac.raw = skb->data;
  12.283 - 	skb->mac_len = skb->nh.raw - skb->data;
  12.284 - 	__skb_pull(skb, skb->mac_len);
  12.285 - 
  12.286 -+	if (unlikely(skb->ip_summed != CHECKSUM_HW)) {
  12.287 -+		static int warned;
  12.288 -+
  12.289 -+		WARN_ON(!warned);
  12.290 -+		warned = 1;
  12.291 -+
  12.292 -+		if (skb_header_cloned(skb) &&
  12.293 -+		    (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
  12.294 -+			return ERR_PTR(err);
  12.295 -+	}
  12.296 -+
  12.297 - 	rcu_read_lock();
  12.298 - 	list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type) & 15], list) {
  12.299 - 		if (ptype->type == type && !ptype->dev && ptype->gso_segment) {
  12.300 -+			if (unlikely(skb->ip_summed != CHECKSUM_HW)) {
  12.301 -+				err = ptype->gso_send_check(skb);
  12.302 -+				segs = ERR_PTR(err);
  12.303 -+				if (err || skb_gso_ok(skb, features))
  12.304 -+					break;
  12.305 -+				__skb_push(skb, skb->data - skb->nh.raw);
  12.306 -+			}
  12.307 - 			segs = ptype->gso_segment(skb, features);
  12.308 - 			break;
  12.309 - 		}
  12.310 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/af_inet.c ./net/ipv4/af_inet.c
  12.311 ---- ../orig-linux-2.6.16.29/net/ipv4/af_inet.c	2006-09-19 13:59:20.000000000 +0100
  12.312 -+++ ./net/ipv4/af_inet.c	2006-09-19 13:59:46.000000000 +0100
  12.313 -@@ -1085,6 +1085,40 @@ int inet_sk_rebuild_header(struct sock *
  12.314 - 
  12.315 - EXPORT_SYMBOL(inet_sk_rebuild_header);
  12.316 - 
  12.317 -+static int inet_gso_send_check(struct sk_buff *skb)
  12.318 -+{
  12.319 -+	struct iphdr *iph;
  12.320 -+	struct net_protocol *ops;
  12.321 -+	int proto;
  12.322 -+	int ihl;
  12.323 -+	int err = -EINVAL;
  12.324 -+
  12.325 -+	if (unlikely(!pskb_may_pull(skb, sizeof(*iph))))
  12.326 -+		goto out;
  12.327 -+
  12.328 -+	iph = skb->nh.iph;
  12.329 -+	ihl = iph->ihl * 4;
  12.330 -+	if (ihl < sizeof(*iph))
  12.331 -+		goto out;
  12.332 -+
  12.333 -+	if (unlikely(!pskb_may_pull(skb, ihl)))
  12.334 -+		goto out;
  12.335 -+
  12.336 -+	skb->h.raw = __skb_pull(skb, ihl);
  12.337 -+	iph = skb->nh.iph;
  12.338 -+	proto = iph->protocol & (MAX_INET_PROTOS - 1);
  12.339 -+	err = -EPROTONOSUPPORT;
  12.340 -+
  12.341 -+	rcu_read_lock();
  12.342 -+	ops = rcu_dereference(inet_protos[proto]);
  12.343 -+	if (likely(ops && ops->gso_send_check))
  12.344 -+		err = ops->gso_send_check(skb);
  12.345 -+	rcu_read_unlock();
  12.346 -+
  12.347 -+out:
  12.348 -+	return err;
  12.349 -+}
  12.350 -+
  12.351 - static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int features)
  12.352 - {
  12.353 - 	struct sk_buff *segs = ERR_PTR(-EINVAL);
  12.354 -@@ -1142,6 +1176,7 @@ static struct net_protocol igmp_protocol
  12.355 - static struct net_protocol tcp_protocol = {
  12.356 - 	.handler =	tcp_v4_rcv,
  12.357 - 	.err_handler =	tcp_v4_err,
  12.358 -+	.gso_send_check = tcp_v4_gso_send_check,
  12.359 - 	.gso_segment =	tcp_tso_segment,
  12.360 - 	.no_policy =	1,
  12.361 - };
  12.362 -@@ -1188,6 +1223,7 @@ static int ipv4_proc_init(void);
  12.363 - static struct packet_type ip_packet_type = {
  12.364 - 	.type = __constant_htons(ETH_P_IP),
  12.365 - 	.func = ip_rcv,
  12.366 -+	.gso_send_check = inet_gso_send_check,
  12.367 - 	.gso_segment = inet_gso_segment,
  12.368 - };
  12.369 - 
  12.370 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/ip_output.c ./net/ipv4/ip_output.c
  12.371 ---- ../orig-linux-2.6.16.29/net/ipv4/ip_output.c	2006-09-19 13:59:20.000000000 +0100
  12.372 -+++ ./net/ipv4/ip_output.c	2006-09-19 13:59:46.000000000 +0100
  12.373 -@@ -210,7 +210,7 @@ static inline int ip_finish_output(struc
  12.374 - 		return dst_output(skb);
  12.375 - 	}
  12.376 - #endif
  12.377 --	if (skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size)
  12.378 -+	if (skb->len > dst_mtu(skb->dst) && !skb_is_gso(skb))
  12.379 - 		return ip_fragment(skb, ip_finish_output2);
  12.380 - 	else
  12.381 - 		return ip_finish_output2(skb);
  12.382 -@@ -1095,7 +1095,7 @@ ssize_t	ip_append_page(struct sock *sk, 
  12.383 - 	while (size > 0) {
  12.384 - 		int i;
  12.385 - 
  12.386 --		if (skb_shinfo(skb)->gso_size)
  12.387 -+		if (skb_is_gso(skb))
  12.388 - 			len = size;
  12.389 - 		else {
  12.390 - 
  12.391 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/tcp_ipv4.c ./net/ipv4/tcp_ipv4.c
  12.392 ---- ../orig-linux-2.6.16.29/net/ipv4/tcp_ipv4.c	2006-09-12 19:02:10.000000000 +0100
  12.393 -+++ ./net/ipv4/tcp_ipv4.c	2006-09-19 13:59:46.000000000 +0100
  12.394 -@@ -495,6 +495,24 @@ void tcp_v4_send_check(struct sock *sk, 
  12.395 - 	}
  12.396 - }
  12.397 - 
  12.398 -+int tcp_v4_gso_send_check(struct sk_buff *skb)
  12.399 -+{
  12.400 -+	struct iphdr *iph;
  12.401 -+	struct tcphdr *th;
  12.402 -+
  12.403 -+	if (!pskb_may_pull(skb, sizeof(*th)))
  12.404 -+		return -EINVAL;
  12.405 -+
  12.406 -+	iph = skb->nh.iph;
  12.407 -+	th = skb->h.th;
  12.408 -+
  12.409 -+	th->check = 0;
  12.410 -+	th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
  12.411 -+	skb->csum = offsetof(struct tcphdr, check);
  12.412 -+	skb->ip_summed = CHECKSUM_HW;
  12.413 -+	return 0;
  12.414 -+}
  12.415 -+
  12.416 - /*
  12.417 -  *	This routine will send an RST to the other tcp.
  12.418 -  *
  12.419 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c ./net/ipv4/xfrm4_output.c
  12.420 ---- ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c	2006-09-19 13:59:20.000000000 +0100
  12.421 -+++ ./net/ipv4/xfrm4_output.c	2006-09-19 13:59:46.000000000 +0100
  12.422 -@@ -195,7 +195,7 @@ static int xfrm4_output_finish(struct sk
  12.423 - 	}
  12.424 - #endif
  12.425 - 
  12.426 --	if (!skb_shinfo(skb)->gso_size)
  12.427 -+	if (!skb_is_gso(skb))
  12.428 - 		return xfrm4_output_finish2(skb);
  12.429 - 
  12.430 - 	skb->protocol = htons(ETH_P_IP);
  12.431 -diff -pruN ../orig-linux-2.6.16.29/net/ipv6/ip6_output.c ./net/ipv6/ip6_output.c
  12.432 ---- ../orig-linux-2.6.16.29/net/ipv6/ip6_output.c	2006-09-19 13:59:20.000000000 +0100
  12.433 -+++ ./net/ipv6/ip6_output.c	2006-09-19 13:59:46.000000000 +0100
  12.434 -@@ -147,7 +147,7 @@ static int ip6_output2(struct sk_buff *s
  12.435 - 
  12.436 - int ip6_output(struct sk_buff *skb)
  12.437 - {
  12.438 --	if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size) ||
  12.439 -+	if ((skb->len > dst_mtu(skb->dst) && !skb_is_gso(skb)) ||
  12.440 - 				dst_allfrag(skb->dst))
  12.441 - 		return ip6_fragment(skb, ip6_output2);
  12.442 - 	else
  12.443 -diff -pruN ../orig-linux-2.6.16.29/net/ipv6/xfrm6_output.c ./net/ipv6/xfrm6_output.c
  12.444 ---- ../orig-linux-2.6.16.29/net/ipv6/xfrm6_output.c	2006-09-19 13:59:20.000000000 +0100
  12.445 -+++ ./net/ipv6/xfrm6_output.c	2006-09-19 13:59:46.000000000 +0100
  12.446 -@@ -179,7 +179,7 @@ static int xfrm6_output_finish(struct sk
  12.447 - {
  12.448 - 	struct sk_buff *segs;
  12.449 - 
  12.450 --	if (!skb_shinfo(skb)->gso_size)
  12.451 -+	if (!skb_is_gso(skb))
  12.452 - 		return xfrm6_output_finish2(skb);
  12.453 - 
  12.454 - 	skb->protocol = htons(ETH_P_IP);