1.1 --- a/buildconfigs/mk.linux-2.6-xen	Mon Nov 27 13:22:21 2006 +0000
     1.2 +++ b/buildconfigs/mk.linux-2.6-xen	Mon Nov 27 13:50:01 2006 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  LINUX_SERIES = 2.6
     1.5 -LINUX_VER    = 2.6.16.29
     1.6 +LINUX_VER    = 2.6.16.30
     1.7  
     1.8  EXTRAVERSION ?= xen
     1.9  

     2.1 --- a/patches/linux-2.6.16.29/blktap-aio-16_03_06.patch	Mon Nov 27 13:22:21 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.29/device_bind.patch	Mon Nov 27 13:22:21 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.29/fix-hz-suspend.patch	Mon Nov 27 13:22:21 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.29/fix-ide-cd-pio-mode.patch	Mon Nov 27 13:22:21 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.29/i386-mach-io-check-nmi.patch	Mon Nov 27 13:22:21 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.29/ipv6-no-autoconf.patch	Mon Nov 27 13:22:21 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.29/net-csum.patch	Mon Nov 27 13:22:21 2006 +0000
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,63 +0,0 @@
     8.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
     8.5 ---- ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-09-12 19:02:10.000000000 +0100
     8.6 -+++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-09-19 13:59:15.000000000 +0100
     8.7 -@@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
     8.8 - 	if (hdrsize < sizeof(*hdr))
     8.9 - 		return 1;
    8.10 - 
    8.11 --	hdr->check = ip_nat_cheat_check(~oldip, newip,
    8.12 -+#ifdef CONFIG_XEN
    8.13 -+	if ((*pskb)->proto_csum_blank)
    8.14 -+		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
    8.15 -+	else
    8.16 -+#endif
    8.17 -+		hdr->check = ip_nat_cheat_check(~oldip, newip,
    8.18 - 					ip_nat_cheat_check(oldport ^ 0xFFFF,
    8.19 - 							   newport,
    8.20 - 							   hdr->check));
    8.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
    8.22 ---- ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-09-12 19:02:10.000000000 +0100
    8.23 -+++ ./net/ipv4/netfilter/ip_nat_proto_udp.c	2006-09-19 13:59:15.000000000 +0100
    8.24 -@@ -113,11 +113,17 @@ udp_manip_pkt(struct sk_buff **pskb,
    8.25 - 		newport = tuple->dst.u.udp.port;
    8.26 - 		portptr = &hdr->dest;
    8.27 - 	}
    8.28 --	if (hdr->check) /* 0 is a special case meaning no checksum */
    8.29 --		hdr->check = ip_nat_cheat_check(~oldip, newip,
    8.30 -+	if (hdr->check) { /* 0 is a special case meaning no checksum */
    8.31 -+#ifdef CONFIG_XEN
    8.32 -+		if ((*pskb)->proto_csum_blank)
    8.33 -+			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
    8.34 -+		else
    8.35 -+#endif
    8.36 -+			hdr->check = ip_nat_cheat_check(~oldip, newip,
    8.37 - 					ip_nat_cheat_check(*portptr ^ 0xFFFF,
    8.38 - 							   newport,
    8.39 - 							   hdr->check));
    8.40 -+	}
    8.41 - 	*portptr = newport;
    8.42 - 	return 1;
    8.43 - }
    8.44 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c ./net/ipv4/xfrm4_output.c
    8.45 ---- ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c	2006-09-12 19:02:10.000000000 +0100
    8.46 -+++ ./net/ipv4/xfrm4_output.c	2006-09-19 13:59:15.000000000 +0100
    8.47 -@@ -17,6 +17,8 @@
    8.48 - #include <net/xfrm.h>
    8.49 - #include <net/icmp.h>
    8.50 - 
    8.51 -+extern int skb_checksum_setup(struct sk_buff *skb);
    8.52 -+
    8.53 - /* Add encapsulation header.
    8.54 -  *
    8.55 -  * In transport mode, the IP header will be moved forward to make space
    8.56 -@@ -103,6 +105,10 @@ static int xfrm4_output_one(struct sk_bu
    8.57 - 	struct xfrm_state *x = dst->xfrm;
    8.58 - 	int err;
    8.59 - 	
    8.60 -+	err = skb_checksum_setup(skb);
    8.61 -+	if (err)
    8.62 -+		goto error_nolock;
    8.63 -+
    8.64 - 	if (skb->ip_summed == CHECKSUM_HW) {
    8.65 - 		err = skb_checksum_help(skb, 0);
    8.66 - 		if (err)

     9.1 --- a/patches/linux-2.6.16.29/net-gso-0-base.patch	Mon Nov 27 13:22:21 2006 +0000
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,2835 +0,0 @@
     9.4 -diff -pruN ../orig-linux-2.6.16.29/Documentation/networking/netdevices.txt ./Documentation/networking/netdevices.txt
     9.5 ---- ../orig-linux-2.6.16.29/Documentation/networking/netdevices.txt	2006-09-12 19:02:10.000000000 +0100
     9.6 -+++ ./Documentation/networking/netdevices.txt	2006-09-19 13:59:20.000000000 +0100
     9.7 -@@ -42,9 +42,9 @@ dev->get_stats:
     9.8 - 	Context: nominally process, but don't sleep inside an rwlock
     9.9 - 
    9.10 - dev->hard_start_xmit:
    9.11 --	Synchronization: dev->xmit_lock spinlock.
    9.12 -+	Synchronization: netif_tx_lock spinlock.
    9.13 - 	When the driver sets NETIF_F_LLTX in dev->features this will be
    9.14 --	called without holding xmit_lock. In this case the driver 
    9.15 -+	called without holding netif_tx_lock. In this case the driver
    9.16 - 	has to lock by itself when needed. It is recommended to use a try lock
    9.17 - 	for this and return -1 when the spin lock fails. 
    9.18 - 	The locking there should also properly protect against 
    9.19 -@@ -62,12 +62,12 @@ dev->hard_start_xmit:
    9.20 - 	  Only valid when NETIF_F_LLTX is set.
    9.21 - 
    9.22 - dev->tx_timeout:
    9.23 --	Synchronization: dev->xmit_lock spinlock.
    9.24 -+	Synchronization: netif_tx_lock spinlock.
    9.25 - 	Context: BHs disabled
    9.26 - 	Notes: netif_queue_stopped() is guaranteed true
    9.27 - 
    9.28 - dev->set_multicast_list:
    9.29 --	Synchronization: dev->xmit_lock spinlock.
    9.30 -+	Synchronization: netif_tx_lock spinlock.
    9.31 - 	Context: BHs disabled
    9.32 - 
    9.33 - dev->poll:
    9.34 -diff -pruN ../orig-linux-2.6.16.29/drivers/block/aoe/aoenet.c ./drivers/block/aoe/aoenet.c
    9.35 ---- ../orig-linux-2.6.16.29/drivers/block/aoe/aoenet.c	2006-09-12 19:02:10.000000000 +0100
    9.36 -+++ ./drivers/block/aoe/aoenet.c	2006-09-19 13:59:20.000000000 +0100
    9.37 -@@ -95,9 +95,8 @@ mac_addr(char addr[6])
    9.38 - static struct sk_buff *
    9.39 - skb_check(struct sk_buff *skb)
    9.40 - {
    9.41 --	if (skb_is_nonlinear(skb))
    9.42 - 	if ((skb = skb_share_check(skb, GFP_ATOMIC)))
    9.43 --	if (skb_linearize(skb, GFP_ATOMIC) < 0) {
    9.44 -+	if (skb_linearize(skb)) {
    9.45 - 		dev_kfree_skb(skb);
    9.46 - 		return NULL;
    9.47 - 	}
    9.48 -diff -pruN ../orig-linux-2.6.16.29/drivers/infiniband/ulp/ipoib/ipoib_multicast.c ./drivers/infiniband/ulp/ipoib/ipoib_multicast.c
    9.49 ---- ../orig-linux-2.6.16.29/drivers/infiniband/ulp/ipoib/ipoib_multicast.c	2006-09-12 19:02:10.000000000 +0100
    9.50 -+++ ./drivers/infiniband/ulp/ipoib/ipoib_multicast.c	2006-09-19 13:59:20.000000000 +0100
    9.51 -@@ -821,7 +821,8 @@ void ipoib_mcast_restart_task(void *dev_
    9.52 - 
    9.53 - 	ipoib_mcast_stop_thread(dev, 0);
    9.54 - 
    9.55 --	spin_lock_irqsave(&dev->xmit_lock, flags);
    9.56 -+	local_irq_save(flags);
    9.57 -+	netif_tx_lock(dev);
    9.58 - 	spin_lock(&priv->lock);
    9.59 - 
    9.60 - 	/*
    9.61 -@@ -896,7 +897,8 @@ void ipoib_mcast_restart_task(void *dev_
    9.62 - 	}
    9.63 - 
    9.64 - 	spin_unlock(&priv->lock);
    9.65 --	spin_unlock_irqrestore(&dev->xmit_lock, flags);
    9.66 -+	netif_tx_unlock(dev);
    9.67 -+	local_irq_restore(flags);
    9.68 - 
    9.69 - 	/* We have to cancel outside of the spinlock */
    9.70 - 	list_for_each_entry_safe(mcast, tmcast, &remove_list, list) {
    9.71 -diff -pruN ../orig-linux-2.6.16.29/drivers/media/dvb/dvb-core/dvb_net.c ./drivers/media/dvb/dvb-core/dvb_net.c
    9.72 ---- ../orig-linux-2.6.16.29/drivers/media/dvb/dvb-core/dvb_net.c	2006-09-12 19:02:10.000000000 +0100
    9.73 -+++ ./drivers/media/dvb/dvb-core/dvb_net.c	2006-09-19 13:59:20.000000000 +0100
    9.74 -@@ -1052,7 +1052,7 @@ static void wq_set_multicast_list (void 
    9.75 - 
    9.76 - 	dvb_net_feed_stop(dev);
    9.77 - 	priv->rx_mode = RX_MODE_UNI;
    9.78 --	spin_lock_bh(&dev->xmit_lock);
    9.79 -+	netif_tx_lock_bh(dev);
    9.80 - 
    9.81 - 	if (dev->flags & IFF_PROMISC) {
    9.82 - 		dprintk("%s: promiscuous mode\n", dev->name);
    9.83 -@@ -1077,7 +1077,7 @@ static void wq_set_multicast_list (void 
    9.84 - 		}
    9.85 - 	}
    9.86 - 
    9.87 --	spin_unlock_bh(&dev->xmit_lock);
    9.88 -+	netif_tx_unlock_bh(dev);
    9.89 - 	dvb_net_feed_start(dev);
    9.90 - }
    9.91 - 
    9.92 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/8139cp.c ./drivers/net/8139cp.c
    9.93 ---- ../orig-linux-2.6.16.29/drivers/net/8139cp.c	2006-09-12 19:02:10.000000000 +0100
    9.94 -+++ ./drivers/net/8139cp.c	2006-09-19 13:59:20.000000000 +0100
    9.95 -@@ -794,7 +794,7 @@ static int cp_start_xmit (struct sk_buff
    9.96 - 	entry = cp->tx_head;
    9.97 - 	eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;
    9.98 - 	if (dev->features & NETIF_F_TSO)
    9.99 --		mss = skb_shinfo(skb)->tso_size;
   9.100 -+		mss = skb_shinfo(skb)->gso_size;
   9.101 - 
   9.102 - 	if (skb_shinfo(skb)->nr_frags == 0) {
   9.103 - 		struct cp_desc *txd = &cp->tx_ring[entry];
   9.104 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/bnx2.c ./drivers/net/bnx2.c
   9.105 ---- ../orig-linux-2.6.16.29/drivers/net/bnx2.c	2006-09-12 19:02:10.000000000 +0100
   9.106 -+++ ./drivers/net/bnx2.c	2006-09-19 13:59:20.000000000 +0100
   9.107 -@@ -1593,7 +1593,7 @@ bnx2_tx_int(struct bnx2 *bp)
   9.108 - 		skb = tx_buf->skb;
   9.109 - #ifdef BCM_TSO 
   9.110 - 		/* partial BD completions possible with TSO packets */
   9.111 --		if (skb_shinfo(skb)->tso_size) {
   9.112 -+		if (skb_shinfo(skb)->gso_size) {
   9.113 - 			u16 last_idx, last_ring_idx;
   9.114 - 
   9.115 - 			last_idx = sw_cons +
   9.116 -@@ -1948,7 +1948,7 @@ bnx2_poll(struct net_device *dev, int *b
   9.117 - 	return 1;
   9.118 - }
   9.119 - 
   9.120 --/* Called with rtnl_lock from vlan functions and also dev->xmit_lock
   9.121 -+/* Called with rtnl_lock from vlan functions and also netif_tx_lock
   9.122 -  * from set_multicast.
   9.123 -  */
   9.124 - static void
   9.125 -@@ -4403,7 +4403,7 @@ bnx2_vlan_rx_kill_vid(struct net_device 
   9.126 - }
   9.127 - #endif
   9.128 - 
   9.129 --/* Called with dev->xmit_lock.
   9.130 -+/* Called with netif_tx_lock.
   9.131 -  * hard_start_xmit is pseudo-lockless - a lock is only required when
   9.132 -  * the tx queue is full. This way, we get the benefit of lockless
   9.133 -  * operations most of the time without the complexities to handle
   9.134 -@@ -4441,7 +4441,7 @@ bnx2_start_xmit(struct sk_buff *skb, str
   9.135 - 			(TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16));
   9.136 - 	}
   9.137 - #ifdef BCM_TSO 
   9.138 --	if ((mss = skb_shinfo(skb)->tso_size) &&
   9.139 -+	if ((mss = skb_shinfo(skb)->gso_size) &&
   9.140 - 		(skb->len > (bp->dev->mtu + ETH_HLEN))) {
   9.141 - 		u32 tcp_opt_len, ip_tcp_len;
   9.142 - 
   9.143 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/bonding/bond_main.c ./drivers/net/bonding/bond_main.c
   9.144 ---- ../orig-linux-2.6.16.29/drivers/net/bonding/bond_main.c	2006-09-12 19:02:10.000000000 +0100
   9.145 -+++ ./drivers/net/bonding/bond_main.c	2006-09-19 13:59:20.000000000 +0100
   9.146 -@@ -1145,8 +1145,7 @@ int bond_sethwaddr(struct net_device *bo
   9.147 - }
   9.148 - 
   9.149 - #define BOND_INTERSECT_FEATURES \
   9.150 --	(NETIF_F_SG|NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM|\
   9.151 --	NETIF_F_TSO|NETIF_F_UFO)
   9.152 -+	(NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_TSO | NETIF_F_UFO)
   9.153 - 
   9.154 - /* 
   9.155 -  * Compute the common dev->feature set available to all slaves.  Some
   9.156 -@@ -1164,9 +1163,7 @@ static int bond_compute_features(struct 
   9.157 - 		features &= (slave->dev->features & BOND_INTERSECT_FEATURES);
   9.158 - 
   9.159 - 	if ((features & NETIF_F_SG) && 
   9.160 --	    !(features & (NETIF_F_IP_CSUM |
   9.161 --			  NETIF_F_NO_CSUM |
   9.162 --			  NETIF_F_HW_CSUM)))
   9.163 -+	    !(features & NETIF_F_ALL_CSUM))
   9.164 - 		features &= ~NETIF_F_SG;
   9.165 - 
   9.166 - 	/* 
   9.167 -@@ -4147,7 +4144,7 @@ static int bond_init(struct net_device *
   9.168 - 	 */
   9.169 - 	bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
   9.170 - 
   9.171 --	/* don't acquire bond device's xmit_lock when 
   9.172 -+	/* don't acquire bond device's netif_tx_lock when
   9.173 - 	 * transmitting */
   9.174 - 	bond_dev->features |= NETIF_F_LLTX;
   9.175 - 
   9.176 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/chelsio/sge.c ./drivers/net/chelsio/sge.c
   9.177 ---- ../orig-linux-2.6.16.29/drivers/net/chelsio/sge.c	2006-09-12 19:02:10.000000000 +0100
   9.178 -+++ ./drivers/net/chelsio/sge.c	2006-09-19 13:59:20.000000000 +0100
   9.179 -@@ -1419,7 +1419,7 @@ int t1_start_xmit(struct sk_buff *skb, s
   9.180 - 	struct cpl_tx_pkt *cpl;
   9.181 - 
   9.182 - #ifdef NETIF_F_TSO
   9.183 --	if (skb_shinfo(skb)->tso_size) {
   9.184 -+	if (skb_shinfo(skb)->gso_size) {
   9.185 - 		int eth_type;
   9.186 - 		struct cpl_tx_pkt_lso *hdr;
   9.187 - 
   9.188 -@@ -1434,7 +1434,7 @@ int t1_start_xmit(struct sk_buff *skb, s
   9.189 - 		hdr->ip_hdr_words = skb->nh.iph->ihl;
   9.190 - 		hdr->tcp_hdr_words = skb->h.th->doff;
   9.191 - 		hdr->eth_type_mss = htons(MK_ETH_TYPE_MSS(eth_type,
   9.192 --						skb_shinfo(skb)->tso_size));
   9.193 -+						skb_shinfo(skb)->gso_size));
   9.194 - 		hdr->len = htonl(skb->len - sizeof(*hdr));
   9.195 - 		cpl = (struct cpl_tx_pkt *)hdr;
   9.196 - 		sge->stats.tx_lso_pkts++;
   9.197 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/e1000/e1000_main.c ./drivers/net/e1000/e1000_main.c
   9.198 ---- ../orig-linux-2.6.16.29/drivers/net/e1000/e1000_main.c	2006-09-12 19:02:10.000000000 +0100
   9.199 -+++ ./drivers/net/e1000/e1000_main.c	2006-09-19 13:59:20.000000000 +0100
   9.200 -@@ -2526,7 +2526,7 @@ e1000_tso(struct e1000_adapter *adapter,
   9.201 - 	uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
   9.202 - 	int err;
   9.203 - 
   9.204 --	if (skb_shinfo(skb)->tso_size) {
   9.205 -+	if (skb_shinfo(skb)->gso_size) {
   9.206 - 		if (skb_header_cloned(skb)) {
   9.207 - 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
   9.208 - 			if (err)
   9.209 -@@ -2534,7 +2534,7 @@ e1000_tso(struct e1000_adapter *adapter,
   9.210 - 		}
   9.211 - 
   9.212 - 		hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
   9.213 --		mss = skb_shinfo(skb)->tso_size;
   9.214 -+		mss = skb_shinfo(skb)->gso_size;
   9.215 - 		if (skb->protocol == ntohs(ETH_P_IP)) {
   9.216 - 			skb->nh.iph->tot_len = 0;
   9.217 - 			skb->nh.iph->check = 0;
   9.218 -@@ -2651,7 +2651,7 @@ e1000_tx_map(struct e1000_adapter *adapt
   9.219 - 		 * tso gets written back prematurely before the data is fully
   9.220 - 		 * DMAd to the controller */
   9.221 - 		if (!skb->data_len && tx_ring->last_tx_tso &&
   9.222 --				!skb_shinfo(skb)->tso_size) {
   9.223 -+				!skb_shinfo(skb)->gso_size) {
   9.224 - 			tx_ring->last_tx_tso = 0;
   9.225 - 			size -= 4;
   9.226 - 		}
   9.227 -@@ -2893,7 +2893,7 @@ e1000_xmit_frame(struct sk_buff *skb, st
   9.228 - 	}
   9.229 - 
   9.230 - #ifdef NETIF_F_TSO
   9.231 --	mss = skb_shinfo(skb)->tso_size;
   9.232 -+	mss = skb_shinfo(skb)->gso_size;
   9.233 - 	/* The controller does a simple calculation to 
   9.234 - 	 * make sure there is enough room in the FIFO before
   9.235 - 	 * initiating the DMA for each buffer.  The calc is:
   9.236 -@@ -2935,7 +2935,7 @@ e1000_xmit_frame(struct sk_buff *skb, st
   9.237 - #ifdef NETIF_F_TSO
   9.238 - 	/* Controller Erratum workaround */
   9.239 - 	if (!skb->data_len && tx_ring->last_tx_tso &&
   9.240 --		!skb_shinfo(skb)->tso_size)
   9.241 -+		!skb_shinfo(skb)->gso_size)
   9.242 - 		count++;
   9.243 - #endif
   9.244 - 
   9.245 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/forcedeth.c ./drivers/net/forcedeth.c
   9.246 ---- ../orig-linux-2.6.16.29/drivers/net/forcedeth.c	2006-09-12 19:02:10.000000000 +0100
   9.247 -+++ ./drivers/net/forcedeth.c	2006-09-19 13:59:20.000000000 +0100
   9.248 -@@ -482,9 +482,9 @@ typedef union _ring_type {
   9.249 -  * critical parts:
   9.250 -  * - rx is (pseudo-) lockless: it relies on the single-threading provided
   9.251 -  *	by the arch code for interrupts.
   9.252 -- * - tx setup is lockless: it relies on dev->xmit_lock. Actual submission
   9.253 -+ * - tx setup is lockless: it relies on netif_tx_lock. Actual submission
   9.254 -  *	needs dev->priv->lock :-(
   9.255 -- * - set_multicast_list: preparation lockless, relies on dev->xmit_lock.
   9.256 -+ * - set_multicast_list: preparation lockless, relies on netif_tx_lock.
   9.257 -  */
   9.258 - 
   9.259 - /* in dev: base, irq */
   9.260 -@@ -1016,7 +1016,7 @@ static void drain_ring(struct net_device
   9.261 - 
   9.262 - /*
   9.263 -  * nv_start_xmit: dev->hard_start_xmit function
   9.264 -- * Called with dev->xmit_lock held.
   9.265 -+ * Called with netif_tx_lock held.
   9.266 -  */
   9.267 - static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
   9.268 - {
   9.269 -@@ -1105,8 +1105,8 @@ static int nv_start_xmit(struct sk_buff 
   9.270 - 	np->tx_skbuff[nr] = skb;
   9.271 - 
   9.272 - #ifdef NETIF_F_TSO
   9.273 --	if (skb_shinfo(skb)->tso_size)
   9.274 --		tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->tso_size << NV_TX2_TSO_SHIFT);
   9.275 -+	if (skb_shinfo(skb)->gso_size)
   9.276 -+		tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT);
   9.277 - 	else
   9.278 - #endif
   9.279 - 	tx_flags_extra = (skb->ip_summed == CHECKSUM_HW ? (NV_TX2_CHECKSUM_L3|NV_TX2_CHECKSUM_L4) : 0);
   9.280 -@@ -1203,7 +1203,7 @@ static void nv_tx_done(struct net_device
   9.281 - 
   9.282 - /*
   9.283 -  * nv_tx_timeout: dev->tx_timeout function
   9.284 -- * Called with dev->xmit_lock held.
   9.285 -+ * Called with netif_tx_lock held.
   9.286 -  */
   9.287 - static void nv_tx_timeout(struct net_device *dev)
   9.288 - {
   9.289 -@@ -1524,7 +1524,7 @@ static int nv_change_mtu(struct net_devi
   9.290 - 		 * Changing the MTU is a rare event, it shouldn't matter.
   9.291 - 		 */
   9.292 - 		disable_irq(dev->irq);
   9.293 --		spin_lock_bh(&dev->xmit_lock);
   9.294 -+		netif_tx_lock_bh(dev);
   9.295 - 		spin_lock(&np->lock);
   9.296 - 		/* stop engines */
   9.297 - 		nv_stop_rx(dev);
   9.298 -@@ -1559,7 +1559,7 @@ static int nv_change_mtu(struct net_devi
   9.299 - 		nv_start_rx(dev);
   9.300 - 		nv_start_tx(dev);
   9.301 - 		spin_unlock(&np->lock);
   9.302 --		spin_unlock_bh(&dev->xmit_lock);
   9.303 -+		netif_tx_unlock_bh(dev);
   9.304 - 		enable_irq(dev->irq);
   9.305 - 	}
   9.306 - 	return 0;
   9.307 -@@ -1594,7 +1594,7 @@ static int nv_set_mac_address(struct net
   9.308 - 	memcpy(dev->dev_addr, macaddr->sa_data, ETH_ALEN);
   9.309 - 
   9.310 - 	if (netif_running(dev)) {
   9.311 --		spin_lock_bh(&dev->xmit_lock);
   9.312 -+		netif_tx_lock_bh(dev);
   9.313 - 		spin_lock_irq(&np->lock);
   9.314 - 
   9.315 - 		/* stop rx engine */
   9.316 -@@ -1606,7 +1606,7 @@ static int nv_set_mac_address(struct net
   9.317 - 		/* restart rx engine */
   9.318 - 		nv_start_rx(dev);
   9.319 - 		spin_unlock_irq(&np->lock);
   9.320 --		spin_unlock_bh(&dev->xmit_lock);
   9.321 -+		netif_tx_unlock_bh(dev);
   9.322 - 	} else {
   9.323 - 		nv_copy_mac_to_hw(dev);
   9.324 - 	}
   9.325 -@@ -1615,7 +1615,7 @@ static int nv_set_mac_address(struct net
   9.326 - 
   9.327 - /*
   9.328 -  * nv_set_multicast: dev->set_multicast function
   9.329 -- * Called with dev->xmit_lock held.
   9.330 -+ * Called with netif_tx_lock held.
   9.331 -  */
   9.332 - static void nv_set_multicast(struct net_device *dev)
   9.333 - {
   9.334 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/hamradio/6pack.c ./drivers/net/hamradio/6pack.c
   9.335 ---- ../orig-linux-2.6.16.29/drivers/net/hamradio/6pack.c	2006-09-12 19:02:10.000000000 +0100
   9.336 -+++ ./drivers/net/hamradio/6pack.c	2006-09-19 13:59:20.000000000 +0100
   9.337 -@@ -308,9 +308,9 @@ static int sp_set_mac_address(struct net
   9.338 - {
   9.339 - 	struct sockaddr_ax25 *sa = addr;
   9.340 - 
   9.341 --	spin_lock_irq(&dev->xmit_lock);
   9.342 -+	netif_tx_lock_bh(dev);
   9.343 - 	memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
   9.344 --	spin_unlock_irq(&dev->xmit_lock);
   9.345 -+	netif_tx_unlock_bh(dev);
   9.346 - 
   9.347 - 	return 0;
   9.348 - }
   9.349 -@@ -767,9 +767,9 @@ static int sixpack_ioctl(struct tty_stru
   9.350 - 			break;
   9.351 - 		}
   9.352 - 
   9.353 --		spin_lock_irq(&dev->xmit_lock);
   9.354 -+		netif_tx_lock_bh(dev);
   9.355 - 		memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);
   9.356 --		spin_unlock_irq(&dev->xmit_lock);
   9.357 -+		netif_tx_unlock_bh(dev);
   9.358 - 
   9.359 - 		err = 0;
   9.360 - 		break;
   9.361 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/hamradio/mkiss.c ./drivers/net/hamradio/mkiss.c
   9.362 ---- ../orig-linux-2.6.16.29/drivers/net/hamradio/mkiss.c	2006-09-12 19:02:10.000000000 +0100
   9.363 -+++ ./drivers/net/hamradio/mkiss.c	2006-09-19 13:59:20.000000000 +0100
   9.364 -@@ -357,9 +357,9 @@ static int ax_set_mac_address(struct net
   9.365 - {
   9.366 - 	struct sockaddr_ax25 *sa = addr;
   9.367 - 
   9.368 --	spin_lock_irq(&dev->xmit_lock);
   9.369 -+	netif_tx_lock_bh(dev);
   9.370 - 	memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
   9.371 --	spin_unlock_irq(&dev->xmit_lock);
   9.372 -+	netif_tx_unlock_bh(dev);
   9.373 - 
   9.374 - 	return 0;
   9.375 - }
   9.376 -@@ -886,9 +886,9 @@ static int mkiss_ioctl(struct tty_struct
   9.377 - 			break;
   9.378 - 		}
   9.379 - 
   9.380 --		spin_lock_irq(&dev->xmit_lock);
   9.381 -+		netif_tx_lock_bh(dev);
   9.382 - 		memcpy(dev->dev_addr, addr, AX25_ADDR_LEN);
   9.383 --		spin_unlock_irq(&dev->xmit_lock);
   9.384 -+		netif_tx_unlock_bh(dev);
   9.385 - 
   9.386 - 		err = 0;
   9.387 - 		break;
   9.388 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/ifb.c ./drivers/net/ifb.c
   9.389 ---- ../orig-linux-2.6.16.29/drivers/net/ifb.c	2006-09-12 19:02:10.000000000 +0100
   9.390 -+++ ./drivers/net/ifb.c	2006-09-19 13:59:20.000000000 +0100
   9.391 -@@ -76,13 +76,13 @@ static void ri_tasklet(unsigned long dev
   9.392 - 	dp->st_task_enter++;
   9.393 - 	if ((skb = skb_peek(&dp->tq)) == NULL) {
   9.394 - 		dp->st_txq_refl_try++;
   9.395 --		if (spin_trylock(&_dev->xmit_lock)) {
   9.396 -+		if (netif_tx_trylock(_dev)) {
   9.397 - 			dp->st_rxq_enter++;
   9.398 - 			while ((skb = skb_dequeue(&dp->rq)) != NULL) {
   9.399 - 				skb_queue_tail(&dp->tq, skb);
   9.400 - 				dp->st_rx2tx_tran++;
   9.401 - 			}
   9.402 --			spin_unlock(&_dev->xmit_lock);
   9.403 -+			netif_tx_unlock(_dev);
   9.404 - 		} else {
   9.405 - 			/* reschedule */
   9.406 - 			dp->st_rxq_notenter++;
   9.407 -@@ -110,7 +110,7 @@ static void ri_tasklet(unsigned long dev
   9.408 - 		}
   9.409 - 	}
   9.410 - 
   9.411 --	if (spin_trylock(&_dev->xmit_lock)) {
   9.412 -+	if (netif_tx_trylock(_dev)) {
   9.413 - 		dp->st_rxq_check++;
   9.414 - 		if ((skb = skb_peek(&dp->rq)) == NULL) {
   9.415 - 			dp->tasklet_pending = 0;
   9.416 -@@ -118,10 +118,10 @@ static void ri_tasklet(unsigned long dev
   9.417 - 				netif_wake_queue(_dev);
   9.418 - 		} else {
   9.419 - 			dp->st_rxq_rsch++;
   9.420 --			spin_unlock(&_dev->xmit_lock);
   9.421 -+			netif_tx_unlock(_dev);
   9.422 - 			goto resched;
   9.423 - 		}
   9.424 --		spin_unlock(&_dev->xmit_lock);
   9.425 -+		netif_tx_unlock(_dev);
   9.426 - 	} else {
   9.427 - resched:
   9.428 - 		dp->tasklet_pending = 1;
   9.429 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/irda/vlsi_ir.c ./drivers/net/irda/vlsi_ir.c
   9.430 ---- ../orig-linux-2.6.16.29/drivers/net/irda/vlsi_ir.c	2006-09-12 19:02:10.000000000 +0100
   9.431 -+++ ./drivers/net/irda/vlsi_ir.c	2006-09-19 13:59:20.000000000 +0100
   9.432 -@@ -959,7 +959,7 @@ static int vlsi_hard_start_xmit(struct s
   9.433 - 			    ||  (now.tv_sec==ready.tv_sec && now.tv_usec>=ready.tv_usec))
   9.434 - 			    	break;
   9.435 - 			udelay(100);
   9.436 --			/* must not sleep here - we are called under xmit_lock! */
   9.437 -+			/* must not sleep here - called under netif_tx_lock! */
   9.438 - 		}
   9.439 - 	}
   9.440 - 
   9.441 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/ixgb/ixgb_main.c ./drivers/net/ixgb/ixgb_main.c
   9.442 ---- ../orig-linux-2.6.16.29/drivers/net/ixgb/ixgb_main.c	2006-09-12 19:02:10.000000000 +0100
   9.443 -+++ ./drivers/net/ixgb/ixgb_main.c	2006-09-19 13:59:20.000000000 +0100
   9.444 -@@ -1163,7 +1163,7 @@ ixgb_tso(struct ixgb_adapter *adapter, s
   9.445 - 	uint16_t ipcse, tucse, mss;
   9.446 - 	int err;
   9.447 - 
   9.448 --	if(likely(skb_shinfo(skb)->tso_size)) {
   9.449 -+	if(likely(skb_shinfo(skb)->gso_size)) {
   9.450 - 		if (skb_header_cloned(skb)) {
   9.451 - 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
   9.452 - 			if (err)
   9.453 -@@ -1171,7 +1171,7 @@ ixgb_tso(struct ixgb_adapter *adapter, s
   9.454 - 		}
   9.455 - 
   9.456 - 		hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
   9.457 --		mss = skb_shinfo(skb)->tso_size;
   9.458 -+		mss = skb_shinfo(skb)->gso_size;
   9.459 - 		skb->nh.iph->tot_len = 0;
   9.460 - 		skb->nh.iph->check = 0;
   9.461 - 		skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
   9.462 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/loopback.c ./drivers/net/loopback.c
   9.463 ---- ../orig-linux-2.6.16.29/drivers/net/loopback.c	2006-09-12 19:02:10.000000000 +0100
   9.464 -+++ ./drivers/net/loopback.c	2006-09-19 13:59:20.000000000 +0100
   9.465 -@@ -74,7 +74,7 @@ static void emulate_large_send_offload(s
   9.466 - 	struct iphdr *iph = skb->nh.iph;
   9.467 - 	struct tcphdr *th = (struct tcphdr*)(skb->nh.raw + (iph->ihl * 4));
   9.468 - 	unsigned int doffset = (iph->ihl + th->doff) * 4;
   9.469 --	unsigned int mtu = skb_shinfo(skb)->tso_size + doffset;
   9.470 -+	unsigned int mtu = skb_shinfo(skb)->gso_size + doffset;
   9.471 - 	unsigned int offset = 0;
   9.472 - 	u32 seq = ntohl(th->seq);
   9.473 - 	u16 id  = ntohs(iph->id);
   9.474 -@@ -139,7 +139,7 @@ static int loopback_xmit(struct sk_buff 
   9.475 - #endif
   9.476 - 
   9.477 - #ifdef LOOPBACK_TSO
   9.478 --	if (skb_shinfo(skb)->tso_size) {
   9.479 -+	if (skb_shinfo(skb)->gso_size) {
   9.480 - 		BUG_ON(skb->protocol != htons(ETH_P_IP));
   9.481 - 		BUG_ON(skb->nh.iph->protocol != IPPROTO_TCP);
   9.482 - 
   9.483 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/mv643xx_eth.c ./drivers/net/mv643xx_eth.c
   9.484 ---- ../orig-linux-2.6.16.29/drivers/net/mv643xx_eth.c	2006-09-12 19:02:10.000000000 +0100
   9.485 -+++ ./drivers/net/mv643xx_eth.c	2006-09-19 13:59:20.000000000 +0100
   9.486 -@@ -1107,7 +1107,7 @@ static int mv643xx_eth_start_xmit(struct
   9.487 - 
   9.488 - #ifdef MV643XX_CHECKSUM_OFFLOAD_TX
   9.489 - 	if (has_tiny_unaligned_frags(skb)) {
   9.490 --		if ((skb_linearize(skb, GFP_ATOMIC) != 0)) {
   9.491 -+		if (__skb_linearize(skb)) {
   9.492 - 			stats->tx_dropped++;
   9.493 - 			printk(KERN_DEBUG "%s: failed to linearize tiny "
   9.494 - 					"unaligned fragment\n", dev->name);
   9.495 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/natsemi.c ./drivers/net/natsemi.c
   9.496 ---- ../orig-linux-2.6.16.29/drivers/net/natsemi.c	2006-09-12 19:02:10.000000000 +0100
   9.497 -+++ ./drivers/net/natsemi.c	2006-09-19 13:59:20.000000000 +0100
   9.498 -@@ -323,12 +323,12 @@ performance critical codepaths:
   9.499 - The rx process only runs in the interrupt handler. Access from outside
   9.500 - the interrupt handler is only permitted after disable_irq().
   9.501 - 
   9.502 --The rx process usually runs under the dev->xmit_lock. If np->intr_tx_reap
   9.503 -+The rx process usually runs under the netif_tx_lock. If np->intr_tx_reap
   9.504 - is set, then access is permitted under spin_lock_irq(&np->lock).
   9.505 - 
   9.506 - Thus configuration functions that want to access everything must call
   9.507 - 	disable_irq(dev->irq);
   9.508 --	spin_lock_bh(dev->xmit_lock);
   9.509 -+	netif_tx_lock_bh(dev);
   9.510 - 	spin_lock_irq(&np->lock);
   9.511 - 
   9.512 - IV. Notes
   9.513 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/r8169.c ./drivers/net/r8169.c
   9.514 ---- ../orig-linux-2.6.16.29/drivers/net/r8169.c	2006-09-12 19:02:10.000000000 +0100
   9.515 -+++ ./drivers/net/r8169.c	2006-09-19 13:59:20.000000000 +0100
   9.516 -@@ -2171,7 +2171,7 @@ static int rtl8169_xmit_frags(struct rtl
   9.517 - static inline u32 rtl8169_tso_csum(struct sk_buff *skb, struct net_device *dev)
   9.518 - {
   9.519 - 	if (dev->features & NETIF_F_TSO) {
   9.520 --		u32 mss = skb_shinfo(skb)->tso_size;
   9.521 -+		u32 mss = skb_shinfo(skb)->gso_size;
   9.522 - 
   9.523 - 		if (mss)
   9.524 - 			return LargeSend | ((mss & MSSMask) << MSSShift);
   9.525 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/s2io.c ./drivers/net/s2io.c
   9.526 ---- ../orig-linux-2.6.16.29/drivers/net/s2io.c	2006-09-12 19:02:10.000000000 +0100
   9.527 -+++ ./drivers/net/s2io.c	2006-09-19 13:59:20.000000000 +0100
   9.528 -@@ -3522,8 +3522,8 @@ static int s2io_xmit(struct sk_buff *skb
   9.529 - 	txdp->Control_1 = 0;
   9.530 - 	txdp->Control_2 = 0;
   9.531 - #ifdef NETIF_F_TSO
   9.532 --	mss = skb_shinfo(skb)->tso_size;
   9.533 --	if (mss) {
   9.534 -+	mss = skb_shinfo(skb)->gso_size;
   9.535 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV4) {
   9.536 - 		txdp->Control_1 |= TXD_TCP_LSO_EN;
   9.537 - 		txdp->Control_1 |= TXD_TCP_LSO_MSS(mss);
   9.538 - 	}
   9.539 -@@ -3543,10 +3543,10 @@ static int s2io_xmit(struct sk_buff *skb
   9.540 - 	}
   9.541 - 
   9.542 - 	frg_len = skb->len - skb->data_len;
   9.543 --	if (skb_shinfo(skb)->ufo_size) {
   9.544 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4) {
   9.545 - 		int ufo_size;
   9.546 - 
   9.547 --		ufo_size = skb_shinfo(skb)->ufo_size;
   9.548 -+		ufo_size = skb_shinfo(skb)->gso_size;
   9.549 - 		ufo_size &= ~7;
   9.550 - 		txdp->Control_1 |= TXD_UFO_EN;
   9.551 - 		txdp->Control_1 |= TXD_UFO_MSS(ufo_size);
   9.552 -@@ -3572,7 +3572,7 @@ static int s2io_xmit(struct sk_buff *skb
   9.553 - 	txdp->Host_Control = (unsigned long) skb;
   9.554 - 	txdp->Control_1 |= TXD_BUFFER0_SIZE(frg_len);
   9.555 - 
   9.556 --	if (skb_shinfo(skb)->ufo_size)
   9.557 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4)
   9.558 - 		txdp->Control_1 |= TXD_UFO_EN;
   9.559 - 
   9.560 - 	frg_cnt = skb_shinfo(skb)->nr_frags;
   9.561 -@@ -3587,12 +3587,12 @@ static int s2io_xmit(struct sk_buff *skb
   9.562 - 		    (sp->pdev, frag->page, frag->page_offset,
   9.563 - 		     frag->size, PCI_DMA_TODEVICE);
   9.564 - 		txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size);
   9.565 --		if (skb_shinfo(skb)->ufo_size)
   9.566 -+		if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4)
   9.567 - 			txdp->Control_1 |= TXD_UFO_EN;
   9.568 - 	}
   9.569 - 	txdp->Control_1 |= TXD_GATHER_CODE_LAST;
   9.570 - 
   9.571 --	if (skb_shinfo(skb)->ufo_size)
   9.572 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4)
   9.573 - 		frg_cnt++; /* as Txd0 was used for inband header */
   9.574 - 
   9.575 - 	tx_fifo = mac_control->tx_FIFO_start[queue];
   9.576 -@@ -3606,7 +3606,7 @@ static int s2io_xmit(struct sk_buff *skb
   9.577 - 	if (mss)
   9.578 - 		val64 |= TX_FIFO_SPECIAL_FUNC;
   9.579 - #endif
   9.580 --	if (skb_shinfo(skb)->ufo_size)
   9.581 -+	if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4)
   9.582 - 		val64 |= TX_FIFO_SPECIAL_FUNC;
   9.583 - 	writeq(val64, &tx_fifo->List_Control);
   9.584 - 
   9.585 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/sky2.c ./drivers/net/sky2.c
   9.586 ---- ../orig-linux-2.6.16.29/drivers/net/sky2.c	2006-09-12 19:02:10.000000000 +0100
   9.587 -+++ ./drivers/net/sky2.c	2006-09-19 13:59:20.000000000 +0100
   9.588 -@@ -1125,7 +1125,7 @@ static unsigned tx_le_req(const struct s
   9.589 - 	count = sizeof(dma_addr_t) / sizeof(u32);
   9.590 - 	count += skb_shinfo(skb)->nr_frags * count;
   9.591 - 
   9.592 --	if (skb_shinfo(skb)->tso_size)
   9.593 -+	if (skb_shinfo(skb)->gso_size)
   9.594 - 		++count;
   9.595 - 
   9.596 - 	if (skb->ip_summed == CHECKSUM_HW)
   9.597 -@@ -1197,7 +1197,7 @@ static int sky2_xmit_frame(struct sk_buf
   9.598 - 	}
   9.599 - 
   9.600 - 	/* Check for TCP Segmentation Offload */
   9.601 --	mss = skb_shinfo(skb)->tso_size;
   9.602 -+	mss = skb_shinfo(skb)->gso_size;
   9.603 - 	if (mss != 0) {
   9.604 - 		/* just drop the packet if non-linear expansion fails */
   9.605 - 		if (skb_header_cloned(skb) &&
   9.606 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/tg3.c ./drivers/net/tg3.c
   9.607 ---- ../orig-linux-2.6.16.29/drivers/net/tg3.c	2006-09-12 19:02:10.000000000 +0100
   9.608 -+++ ./drivers/net/tg3.c	2006-09-19 13:59:20.000000000 +0100
   9.609 -@@ -3664,7 +3664,7 @@ static int tg3_start_xmit(struct sk_buff
   9.610 - #if TG3_TSO_SUPPORT != 0
   9.611 - 	mss = 0;
   9.612 - 	if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
   9.613 --	    (mss = skb_shinfo(skb)->tso_size) != 0) {
   9.614 -+	    (mss = skb_shinfo(skb)->gso_size) != 0) {
   9.615 - 		int tcp_opt_len, ip_tcp_len;
   9.616 - 
   9.617 - 		if (skb_header_cloned(skb) &&
   9.618 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/tulip/winbond-840.c ./drivers/net/tulip/winbond-840.c
   9.619 ---- ../orig-linux-2.6.16.29/drivers/net/tulip/winbond-840.c	2006-09-12 19:02:10.000000000 +0100
   9.620 -+++ ./drivers/net/tulip/winbond-840.c	2006-09-19 13:59:20.000000000 +0100
   9.621 -@@ -1605,11 +1605,11 @@ static void __devexit w840_remove1 (stru
   9.622 -  * - get_stats:
   9.623 -  * 	spin_lock_irq(np->lock), doesn't touch hw if not present
   9.624 -  * - hard_start_xmit:
   9.625 -- * 	netif_stop_queue + spin_unlock_wait(&dev->xmit_lock);
   9.626 -+ * 	synchronize_irq + netif_tx_disable;
   9.627 -  * - tx_timeout:
   9.628 -- * 	netif_device_detach + spin_unlock_wait(&dev->xmit_lock);
   9.629 -+ * 	netif_device_detach + netif_tx_disable;
   9.630 -  * - set_multicast_list
   9.631 -- * 	netif_device_detach + spin_unlock_wait(&dev->xmit_lock);
   9.632 -+ * 	netif_device_detach + netif_tx_disable;
   9.633 -  * - interrupt handler
   9.634 -  * 	doesn't touch hw if not present, synchronize_irq waits for
   9.635 -  * 	running instances of the interrupt handler.
   9.636 -@@ -1635,11 +1635,10 @@ static int w840_suspend (struct pci_dev 
   9.637 - 		netif_device_detach(dev);
   9.638 - 		update_csr6(dev, 0);
   9.639 - 		iowrite32(0, ioaddr + IntrEnable);
   9.640 --		netif_stop_queue(dev);
   9.641 - 		spin_unlock_irq(&np->lock);
   9.642 - 
   9.643 --		spin_unlock_wait(&dev->xmit_lock);
   9.644 - 		synchronize_irq(dev->irq);
   9.645 -+		netif_tx_disable(dev);
   9.646 - 	
   9.647 - 		np->stats.rx_missed_errors += ioread32(ioaddr + RxMissed) & 0xffff;
   9.648 - 
   9.649 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/typhoon.c ./drivers/net/typhoon.c
   9.650 ---- ../orig-linux-2.6.16.29/drivers/net/typhoon.c	2006-09-12 19:02:10.000000000 +0100
   9.651 -+++ ./drivers/net/typhoon.c	2006-09-19 13:59:20.000000000 +0100
   9.652 -@@ -340,7 +340,7 @@ enum state_values {
   9.653 - #endif
   9.654 - 
   9.655 - #if defined(NETIF_F_TSO)
   9.656 --#define skb_tso_size(x)		(skb_shinfo(x)->tso_size)
   9.657 -+#define skb_tso_size(x)		(skb_shinfo(x)->gso_size)
   9.658 - #define TSO_NUM_DESCRIPTORS	2
   9.659 - #define TSO_OFFLOAD_ON		TYPHOON_OFFLOAD_TCP_SEGMENT
   9.660 - #else
   9.661 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/via-velocity.c ./drivers/net/via-velocity.c
   9.662 ---- ../orig-linux-2.6.16.29/drivers/net/via-velocity.c	2006-09-12 19:02:10.000000000 +0100
   9.663 -+++ ./drivers/net/via-velocity.c	2006-09-19 13:59:20.000000000 +0100
   9.664 -@@ -1899,6 +1899,13 @@ static int velocity_xmit(struct sk_buff 
   9.665 - 
   9.666 - 	int pktlen = skb->len;
   9.667 - 
   9.668 -+#ifdef VELOCITY_ZERO_COPY_SUPPORT
   9.669 -+	if (skb_shinfo(skb)->nr_frags > 6 && __skb_linearize(skb)) {
   9.670 -+		kfree_skb(skb);
   9.671 -+		return 0;
   9.672 -+	}
   9.673 -+#endif
   9.674 -+
   9.675 - 	spin_lock_irqsave(&vptr->lock, flags);
   9.676 - 
   9.677 - 	index = vptr->td_curr[qnum];
   9.678 -@@ -1914,8 +1921,6 @@ static int velocity_xmit(struct sk_buff 
   9.679 - 	 */
   9.680 - 	if (pktlen < ETH_ZLEN) {
   9.681 - 		/* Cannot occur until ZC support */
   9.682 --		if(skb_linearize(skb, GFP_ATOMIC))
   9.683 --			return 0; 
   9.684 - 		pktlen = ETH_ZLEN;
   9.685 - 		memcpy(tdinfo->buf, skb->data, skb->len);
   9.686 - 		memset(tdinfo->buf + skb->len, 0, ETH_ZLEN - skb->len);
   9.687 -@@ -1933,7 +1938,6 @@ static int velocity_xmit(struct sk_buff 
   9.688 - 		int nfrags = skb_shinfo(skb)->nr_frags;
   9.689 - 		tdinfo->skb = skb;
   9.690 - 		if (nfrags > 6) {
   9.691 --			skb_linearize(skb, GFP_ATOMIC);
   9.692 - 			memcpy(tdinfo->buf, skb->data, skb->len);
   9.693 - 			tdinfo->skb_dma[0] = tdinfo->buf_dma;
   9.694 - 			td_ptr->tdesc0.pktsize = 
   9.695 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/wireless/orinoco.c ./drivers/net/wireless/orinoco.c
   9.696 ---- ../orig-linux-2.6.16.29/drivers/net/wireless/orinoco.c	2006-09-12 19:02:10.000000000 +0100
   9.697 -+++ ./drivers/net/wireless/orinoco.c	2006-09-19 13:59:20.000000000 +0100
   9.698 -@@ -1835,7 +1835,9 @@ static int __orinoco_program_rids(struct
   9.699 - 	/* Set promiscuity / multicast*/
   9.700 - 	priv->promiscuous = 0;
   9.701 - 	priv->mc_count = 0;
   9.702 --	__orinoco_set_multicast_list(dev); /* FIXME: what about the xmit_lock */
   9.703 -+
   9.704 -+	/* FIXME: what about netif_tx_lock */
   9.705 -+	__orinoco_set_multicast_list(dev);
   9.706 - 
   9.707 - 	return 0;
   9.708 - }
   9.709 -diff -pruN ../orig-linux-2.6.16.29/drivers/s390/net/qeth_eddp.c ./drivers/s390/net/qeth_eddp.c
   9.710 ---- ../orig-linux-2.6.16.29/drivers/s390/net/qeth_eddp.c	2006-09-12 19:02:10.000000000 +0100
   9.711 -+++ ./drivers/s390/net/qeth_eddp.c	2006-09-19 13:59:20.000000000 +0100
   9.712 -@@ -421,7 +421,7 @@ __qeth_eddp_fill_context_tcp(struct qeth
   9.713 -        }
   9.714 - 	tcph = eddp->skb->h.th;
   9.715 - 	while (eddp->skb_offset < eddp->skb->len) {
   9.716 --		data_len = min((int)skb_shinfo(eddp->skb)->tso_size,
   9.717 -+		data_len = min((int)skb_shinfo(eddp->skb)->gso_size,
   9.718 - 			       (int)(eddp->skb->len - eddp->skb_offset));
   9.719 - 		/* prepare qdio hdr */
   9.720 - 		if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2){
   9.721 -@@ -516,20 +516,20 @@ qeth_eddp_calc_num_pages(struct qeth_edd
   9.722 - 	
   9.723 - 	QETH_DBF_TEXT(trace, 5, "eddpcanp");
   9.724 - 	/* can we put multiple skbs in one page? */
   9.725 --	skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->tso_size + hdr_len);
   9.726 -+	skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->gso_size + hdr_len);
   9.727 - 	if (skbs_per_page > 1){
   9.728 --		ctx->num_pages = (skb_shinfo(skb)->tso_segs + 1) /
   9.729 -+		ctx->num_pages = (skb_shinfo(skb)->gso_segs + 1) /
   9.730 - 				 skbs_per_page + 1;
   9.731 - 		ctx->elements_per_skb = 1;
   9.732 - 	} else {
   9.733 - 		/* no -> how many elements per skb? */
   9.734 --		ctx->elements_per_skb = (skb_shinfo(skb)->tso_size + hdr_len +
   9.735 -+		ctx->elements_per_skb = (skb_shinfo(skb)->gso_size + hdr_len +
   9.736 - 				     PAGE_SIZE) >> PAGE_SHIFT;
   9.737 - 		ctx->num_pages = ctx->elements_per_skb *
   9.738 --				 (skb_shinfo(skb)->tso_segs + 1);
   9.739 -+				 (skb_shinfo(skb)->gso_segs + 1);
   9.740 - 	}
   9.741 - 	ctx->num_elements = ctx->elements_per_skb *
   9.742 --			    (skb_shinfo(skb)->tso_segs + 1);
   9.743 -+			    (skb_shinfo(skb)->gso_segs + 1);
   9.744 - }
   9.745 - 
   9.746 - static inline struct qeth_eddp_context *
   9.747 -diff -pruN ../orig-linux-2.6.16.29/drivers/s390/net/qeth_main.c ./drivers/s390/net/qeth_main.c
   9.748 ---- ../orig-linux-2.6.16.29/drivers/s390/net/qeth_main.c	2006-09-12 19:02:10.000000000 +0100
   9.749 -+++ ./drivers/s390/net/qeth_main.c	2006-09-19 13:59:20.000000000 +0100
   9.750 -@@ -4454,7 +4454,7 @@ qeth_send_packet(struct qeth_card *card,
   9.751 - 	queue = card->qdio.out_qs
   9.752 - 		[qeth_get_priority_queue(card, skb, ipv, cast_type)];
   9.753 - 
   9.754 --	if (skb_shinfo(skb)->tso_size)
   9.755 -+	if (skb_shinfo(skb)->gso_size)
   9.756 - 		large_send = card->options.large_send;
   9.757 - 
   9.758 - 	/*are we able to do TSO ? If so ,prepare and send it from here */
   9.759 -@@ -4501,7 +4501,7 @@ qeth_send_packet(struct qeth_card *card,
   9.760 - 		card->stats.tx_packets++;
   9.761 - 		card->stats.tx_bytes += skb->len;
   9.762 - #ifdef CONFIG_QETH_PERF_STATS
   9.763 --		if (skb_shinfo(skb)->tso_size &&
   9.764 -+		if (skb_shinfo(skb)->gso_size &&
   9.765 - 		   !(large_send == QETH_LARGE_SEND_NO)) {
   9.766 - 			card->perf_stats.large_send_bytes += skb->len;
   9.767 - 			card->perf_stats.large_send_cnt++;
   9.768 -diff -pruN ../orig-linux-2.6.16.29/drivers/s390/net/qeth_tso.h ./drivers/s390/net/qeth_tso.h
   9.769 ---- ../orig-linux-2.6.16.29/drivers/s390/net/qeth_tso.h	2006-09-12 19:02:10.000000000 +0100
   9.770 -+++ ./drivers/s390/net/qeth_tso.h	2006-09-19 13:59:20.000000000 +0100
   9.771 -@@ -51,7 +51,7 @@ qeth_tso_fill_header(struct qeth_card *c
   9.772 - 	hdr->ext.hdr_version = 1;
   9.773 - 	hdr->ext.hdr_len     = 28;
   9.774 - 	/*insert non-fix values */
   9.775 --	hdr->ext.mss = skb_shinfo(skb)->tso_size;
   9.776 -+	hdr->ext.mss = skb_shinfo(skb)->gso_size;
   9.777 - 	hdr->ext.dg_hdr_len = (__u16)(iph->ihl*4 + tcph->doff*4);
   9.778 - 	hdr->ext.payload_len = (__u16)(skb->len - hdr->ext.dg_hdr_len -
   9.779 - 				       sizeof(struct qeth_hdr_tso));
   9.780 -diff -pruN ../orig-linux-2.6.16.29/include/linux/ethtool.h ./include/linux/ethtool.h
   9.781 ---- ../orig-linux-2.6.16.29/include/linux/ethtool.h	2006-09-12 19:02:10.000000000 +0100
   9.782 -+++ ./include/linux/ethtool.h	2006-09-19 13:59:20.000000000 +0100
   9.783 -@@ -408,6 +408,8 @@ struct ethtool_ops {
   9.784 - #define ETHTOOL_GPERMADDR	0x00000020 /* Get permanent hardware address */
   9.785 - #define ETHTOOL_GUFO		0x00000021 /* Get UFO enable (ethtool_value) */
   9.786 - #define ETHTOOL_SUFO		0x00000022 /* Set UFO enable (ethtool_value) */
   9.787 -+#define ETHTOOL_GGSO		0x00000023 /* Get GSO enable (ethtool_value) */
   9.788 -+#define ETHTOOL_SGSO		0x00000024 /* Set GSO enable (ethtool_value) */
   9.789 - 
   9.790 - /* compatibility with older code */
   9.791 - #define SPARC_ETH_GSET		ETHTOOL_GSET
   9.792 -diff -pruN ../orig-linux-2.6.16.29/include/linux/netdevice.h ./include/linux/netdevice.h
   9.793 ---- ../orig-linux-2.6.16.29/include/linux/netdevice.h	2006-09-12 19:02:10.000000000 +0100
   9.794 -+++ ./include/linux/netdevice.h	2006-09-19 13:59:20.000000000 +0100
   9.795 -@@ -230,7 +230,8 @@ enum netdev_state_t
   9.796 - 	__LINK_STATE_SCHED,
   9.797 - 	__LINK_STATE_NOCARRIER,
   9.798 - 	__LINK_STATE_RX_SCHED,
   9.799 --	__LINK_STATE_LINKWATCH_PENDING
   9.800 -+	__LINK_STATE_LINKWATCH_PENDING,
   9.801 -+	__LINK_STATE_QDISC_RUNNING,
   9.802 - };
   9.803 - 
   9.804 - 
   9.805 -@@ -306,9 +307,17 @@ struct net_device
   9.806 - #define NETIF_F_HW_VLAN_RX	256	/* Receive VLAN hw acceleration */
   9.807 - #define NETIF_F_HW_VLAN_FILTER	512	/* Receive filtering on VLAN */
   9.808 - #define NETIF_F_VLAN_CHALLENGED	1024	/* Device cannot handle VLAN packets */
   9.809 --#define NETIF_F_TSO		2048	/* Can offload TCP/IP segmentation */
   9.810 -+#define NETIF_F_GSO		2048	/* Enable software GSO. */
   9.811 - #define NETIF_F_LLTX		4096	/* LockLess TX */
   9.812 --#define NETIF_F_UFO             8192    /* Can offload UDP Large Send*/
   9.813 -+
   9.814 -+	/* Segmentation offload features */
   9.815 -+#define NETIF_F_GSO_SHIFT	16
   9.816 -+#define NETIF_F_TSO		(SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)
   9.817 -+#define NETIF_F_UFO		(SKB_GSO_UDPV4 << NETIF_F_GSO_SHIFT)
   9.818 -+#define NETIF_F_GSO_ROBUST	(SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)
   9.819 -+
   9.820 -+#define NETIF_F_GEN_CSUM	(NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
   9.821 -+#define NETIF_F_ALL_CSUM	(NETIF_F_IP_CSUM | NETIF_F_GEN_CSUM)
   9.822 - 
   9.823 - 	struct net_device	*next_sched;
   9.824 - 
   9.825 -@@ -394,6 +403,9 @@ struct net_device
   9.826 - 	struct list_head	qdisc_list;
   9.827 - 	unsigned long		tx_queue_len;	/* Max frames per queue allowed */
   9.828 - 
   9.829 -+	/* Partially transmitted GSO packet. */
   9.830 -+	struct sk_buff		*gso_skb;
   9.831 -+
   9.832 - 	/* ingress path synchronizer */
   9.833 - 	spinlock_t		ingress_lock;
   9.834 - 	struct Qdisc		*qdisc_ingress;
   9.835 -@@ -402,7 +414,7 @@ struct net_device
   9.836 -  * One part is mostly used on xmit path (device)
   9.837 -  */
   9.838 - 	/* hard_start_xmit synchronizer */
   9.839 --	spinlock_t		xmit_lock ____cacheline_aligned_in_smp;
   9.840 -+	spinlock_t		_xmit_lock ____cacheline_aligned_in_smp;
   9.841 - 	/* cpu id of processor entered to hard_start_xmit or -1,
   9.842 - 	   if nobody entered there.
   9.843 - 	 */
   9.844 -@@ -527,6 +539,8 @@ struct packet_type {
   9.845 - 					 struct net_device *,
   9.846 - 					 struct packet_type *,
   9.847 - 					 struct net_device *);
   9.848 -+	struct sk_buff		*(*gso_segment)(struct sk_buff *skb,
   9.849 -+						int features);
   9.850 - 	void			*af_packet_priv;
   9.851 - 	struct list_head	list;
   9.852 - };
   9.853 -@@ -693,7 +707,8 @@ extern int		dev_change_name(struct net_d
   9.854 - extern int		dev_set_mtu(struct net_device *, int);
   9.855 - extern int		dev_set_mac_address(struct net_device *,
   9.856 - 					    struct sockaddr *);
   9.857 --extern void		dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev);
   9.858 -+extern int		dev_hard_start_xmit(struct sk_buff *skb,
   9.859 -+					    struct net_device *dev);
   9.860 - 
   9.861 - extern void		dev_init(void);
   9.862 - 
   9.863 -@@ -900,11 +915,43 @@ static inline void __netif_rx_complete(s
   9.864 - 	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
   9.865 - }
   9.866 - 
   9.867 -+static inline void netif_tx_lock(struct net_device *dev)
   9.868 -+{
   9.869 -+	spin_lock(&dev->_xmit_lock);
   9.870 -+	dev->xmit_lock_owner = smp_processor_id();
   9.871 -+}
   9.872 -+
   9.873 -+static inline void netif_tx_lock_bh(struct net_device *dev)
   9.874 -+{
   9.875 -+	spin_lock_bh(&dev->_xmit_lock);
   9.876 -+	dev->xmit_lock_owner = smp_processor_id();
   9.877 -+}
   9.878 -+
   9.879 -+static inline int netif_tx_trylock(struct net_device *dev)
   9.880 -+{
   9.881 -+	int err = spin_trylock(&dev->_xmit_lock);
   9.882 -+	if (!err)
   9.883 -+		dev->xmit_lock_owner = smp_processor_id();
   9.884 -+	return err;
   9.885 -+}
   9.886 -+
   9.887 -+static inline void netif_tx_unlock(struct net_device *dev)
   9.888 -+{
   9.889 -+	dev->xmit_lock_owner = -1;
   9.890 -+	spin_unlock(&dev->_xmit_lock);
   9.891 -+}
   9.892 -+
   9.893 -+static inline void netif_tx_unlock_bh(struct net_device *dev)
   9.894 -+{
   9.895 -+	dev->xmit_lock_owner = -1;
   9.896 -+	spin_unlock_bh(&dev->_xmit_lock);
   9.897 -+}
   9.898 -+
   9.899 - static inline void netif_tx_disable(struct net_device *dev)
   9.900 - {
   9.901 --	spin_lock_bh(&dev->xmit_lock);
   9.902 -+	netif_tx_lock_bh(dev);
   9.903 - 	netif_stop_queue(dev);
   9.904 --	spin_unlock_bh(&dev->xmit_lock);
   9.905 -+	netif_tx_unlock_bh(dev);
   9.906 - }
   9.907 - 
   9.908 - /* These functions live elsewhere (drivers/net/net_init.c, but related) */
   9.909 -@@ -932,6 +979,7 @@ extern int		netdev_max_backlog;
   9.910 - extern int		weight_p;
   9.911 - extern int		netdev_set_master(struct net_device *dev, struct net_device *master);
   9.912 - extern int skb_checksum_help(struct sk_buff *skb, int inward);
   9.913 -+extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features);
   9.914 - #ifdef CONFIG_BUG
   9.915 - extern void netdev_rx_csum_fault(struct net_device *dev);
   9.916 - #else
   9.917 -@@ -951,6 +999,18 @@ extern void dev_seq_stop(struct seq_file
   9.918 - 
   9.919 - extern void linkwatch_run_queue(void);
   9.920 - 
   9.921 -+static inline int skb_gso_ok(struct sk_buff *skb, int features)
   9.922 -+{
   9.923 -+	int feature = skb_shinfo(skb)->gso_size ?
   9.924 -+		      skb_shinfo(skb)->gso_type << NETIF_F_GSO_SHIFT : 0;
   9.925 -+	return (features & feature) == feature;
   9.926 -+}
   9.927 -+
   9.928 -+static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
   9.929 -+{
   9.930 -+	return !skb_gso_ok(skb, dev->features);
   9.931 -+}
   9.932 -+
   9.933 - #endif /* __KERNEL__ */
   9.934 - 
   9.935 - #endif	/* _LINUX_DEV_H */
   9.936 -diff -pruN ../orig-linux-2.6.16.29/include/linux/skbuff.h ./include/linux/skbuff.h
   9.937 ---- ../orig-linux-2.6.16.29/include/linux/skbuff.h	2006-09-12 19:02:10.000000000 +0100
   9.938 -+++ ./include/linux/skbuff.h	2006-09-19 13:59:20.000000000 +0100
   9.939 -@@ -134,9 +134,10 @@ struct skb_frag_struct {
   9.940 - struct skb_shared_info {
   9.941 - 	atomic_t	dataref;
   9.942 - 	unsigned short	nr_frags;
   9.943 --	unsigned short	tso_size;
   9.944 --	unsigned short	tso_segs;
   9.945 --	unsigned short  ufo_size;
   9.946 -+	unsigned short	gso_size;
   9.947 -+	/* Warning: this field is not always filled in (UFO)! */
   9.948 -+	unsigned short	gso_segs;
   9.949 -+	unsigned short  gso_type;
   9.950 - 	unsigned int    ip6_frag_id;
   9.951 - 	struct sk_buff	*frag_list;
   9.952 - 	skb_frag_t	frags[MAX_SKB_FRAGS];
   9.953 -@@ -168,6 +169,14 @@ enum {
   9.954 - 	SKB_FCLONE_CLONE,
   9.955 - };
   9.956 - 
   9.957 -+enum {
   9.958 -+	SKB_GSO_TCPV4 = 1 << 0,
   9.959 -+	SKB_GSO_UDPV4 = 1 << 1,
   9.960 -+
   9.961 -+	/* This indicates the skb is from an untrusted source. */
   9.962 -+	SKB_GSO_DODGY = 1 << 2,
   9.963 -+};
   9.964 -+
   9.965 - /** 
   9.966 -  *	struct sk_buff - socket buffer
   9.967 -  *	@next: Next buffer in list
   9.968 -@@ -1148,18 +1157,34 @@ static inline int skb_can_coalesce(struc
   9.969 - 	return 0;
   9.970 - }
   9.971 - 
   9.972 -+static inline int __skb_linearize(struct sk_buff *skb)
   9.973 -+{
   9.974 -+	return __pskb_pull_tail(skb, skb->data_len) ? 0 : -ENOMEM;
   9.975 -+}
   9.976 -+
   9.977 - /**
   9.978 -  *	skb_linearize - convert paged skb to linear one
   9.979 -  *	@skb: buffer to linarize
   9.980 -- *	@gfp: allocation mode
   9.981 -  *
   9.982 -  *	If there is no free memory -ENOMEM is returned, otherwise zero
   9.983 -  *	is returned and the old skb data released.
   9.984 -  */
   9.985 --extern int __skb_linearize(struct sk_buff *skb, gfp_t gfp);
   9.986 --static inline int skb_linearize(struct sk_buff *skb, gfp_t gfp)
   9.987 -+static inline int skb_linearize(struct sk_buff *skb)
   9.988 -+{
   9.989 -+	return skb_is_nonlinear(skb) ? __skb_linearize(skb) : 0;
   9.990 -+}
   9.991 -+
   9.992 -+/**
   9.993 -+ *	skb_linearize_cow - make sure skb is linear and writable
   9.994 -+ *	@skb: buffer to process
   9.995 -+ *
   9.996 -+ *	If there is no free memory -ENOMEM is returned, otherwise zero
   9.997 -+ *	is returned and the old skb data released.
   9.998 -+ */
   9.999 -+static inline int skb_linearize_cow(struct sk_buff *skb)
  9.1000 - {
  9.1001 --	return __skb_linearize(skb, gfp);
  9.1002 -+	return skb_is_nonlinear(skb) || skb_cloned(skb) ?
  9.1003 -+	       __skb_linearize(skb) : 0;
  9.1004 - }
  9.1005 - 
  9.1006 - /**
  9.1007 -@@ -1254,6 +1279,7 @@ extern void	       skb_split(struct sk_b
  9.1008 - 				 struct sk_buff *skb1, const u32 len);
  9.1009 - 
  9.1010 - extern void	       skb_release_data(struct sk_buff *skb);
  9.1011 -+extern struct sk_buff *skb_segment(struct sk_buff *skb, int features);
  9.1012 - 
  9.1013 - static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
  9.1014 - 				       int len, void *buffer)
  9.1015 -diff -pruN ../orig-linux-2.6.16.29/include/net/pkt_sched.h ./include/net/pkt_sched.h
  9.1016 ---- ../orig-linux-2.6.16.29/include/net/pkt_sched.h	2006-09-12 19:02:10.000000000 +0100
  9.1017 -+++ ./include/net/pkt_sched.h	2006-09-19 13:59:20.000000000 +0100
  9.1018 -@@ -218,12 +218,13 @@ extern struct qdisc_rate_table *qdisc_ge
  9.1019 - 		struct rtattr *tab);
  9.1020 - extern void qdisc_put_rtab(struct qdisc_rate_table *tab);
  9.1021 - 
  9.1022 --extern int qdisc_restart(struct net_device *dev);
  9.1023 -+extern void __qdisc_run(struct net_device *dev);
  9.1024 - 
  9.1025 - static inline void qdisc_run(struct net_device *dev)
  9.1026 - {
  9.1027 --	while (!netif_queue_stopped(dev) && qdisc_restart(dev) < 0)
  9.1028 --		/* NOTHING */;
  9.1029 -+	if (!netif_queue_stopped(dev) &&
  9.1030 -+	    !test_and_set_bit(__LINK_STATE_QDISC_RUNNING, &dev->state))
  9.1031 -+		__qdisc_run(dev);
  9.1032 - }
  9.1033 - 
  9.1034 - extern int tc_classify(struct sk_buff *skb, struct tcf_proto *tp,
  9.1035 -diff -pruN ../orig-linux-2.6.16.29/include/net/protocol.h ./include/net/protocol.h
  9.1036 ---- ../orig-linux-2.6.16.29/include/net/protocol.h	2006-09-12 19:02:10.000000000 +0100
  9.1037 -+++ ./include/net/protocol.h	2006-09-19 13:59:20.000000000 +0100
  9.1038 -@@ -37,6 +37,8 @@
  9.1039 - struct net_protocol {
  9.1040 - 	int			(*handler)(struct sk_buff *skb);
  9.1041 - 	void			(*err_handler)(struct sk_buff *skb, u32 info);
  9.1042 -+	struct sk_buff	       *(*gso_segment)(struct sk_buff *skb,
  9.1043 -+					       int features);
  9.1044 - 	int			no_policy;
  9.1045 - };
  9.1046 - 
  9.1047 -diff -pruN ../orig-linux-2.6.16.29/include/net/sock.h ./include/net/sock.h
  9.1048 ---- ../orig-linux-2.6.16.29/include/net/sock.h	2006-09-12 19:02:10.000000000 +0100
  9.1049 -+++ ./include/net/sock.h	2006-09-19 13:59:20.000000000 +0100
  9.1050 -@@ -1064,9 +1064,13 @@ static inline void sk_setup_caps(struct 
  9.1051 - {
  9.1052 - 	__sk_dst_set(sk, dst);
  9.1053 - 	sk->sk_route_caps = dst->dev->features;
  9.1054 -+	if (sk->sk_route_caps & NETIF_F_GSO)
  9.1055 -+		sk->sk_route_caps |= NETIF_F_TSO;
  9.1056 - 	if (sk->sk_route_caps & NETIF_F_TSO) {
  9.1057 - 		if (sock_flag(sk, SOCK_NO_LARGESEND) || dst->header_len)
  9.1058 - 			sk->sk_route_caps &= ~NETIF_F_TSO;
  9.1059 -+		else 
  9.1060 -+			sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM;
  9.1061 - 	}
  9.1062 - }
  9.1063 - 
  9.1064 -diff -pruN ../orig-linux-2.6.16.29/include/net/tcp.h ./include/net/tcp.h
  9.1065 ---- ../orig-linux-2.6.16.29/include/net/tcp.h	2006-09-12 19:02:10.000000000 +0100
  9.1066 -+++ ./include/net/tcp.h	2006-09-19 13:59:20.000000000 +0100
  9.1067 -@@ -552,13 +552,13 @@ struct tcp_skb_cb {
  9.1068 -  */
  9.1069 - static inline int tcp_skb_pcount(const struct sk_buff *skb)
  9.1070 - {
  9.1071 --	return skb_shinfo(skb)->tso_segs;
  9.1072 -+	return skb_shinfo(skb)->gso_segs;
  9.1073 - }
  9.1074 - 
  9.1075 - /* This is valid iff tcp_skb_pcount() > 1. */
  9.1076 - static inline int tcp_skb_mss(const struct sk_buff *skb)
  9.1077 - {
  9.1078 --	return skb_shinfo(skb)->tso_size;
  9.1079 -+	return skb_shinfo(skb)->gso_size;
  9.1080 - }
  9.1081 - 
  9.1082 - static inline void tcp_dec_pcount_approx(__u32 *count,
  9.1083 -@@ -1063,6 +1063,8 @@ extern struct request_sock_ops tcp_reque
  9.1084 - 
  9.1085 - extern int tcp_v4_destroy_sock(struct sock *sk);
  9.1086 - 
  9.1087 -+extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features);
  9.1088 -+
  9.1089 - #ifdef CONFIG_PROC_FS
  9.1090 - extern int  tcp4_proc_init(void);
  9.1091 - extern void tcp4_proc_exit(void);
  9.1092 -diff -pruN ../orig-linux-2.6.16.29/net/atm/clip.c ./net/atm/clip.c
  9.1093 ---- ../orig-linux-2.6.16.29/net/atm/clip.c	2006-09-12 19:02:10.000000000 +0100
  9.1094 -+++ ./net/atm/clip.c	2006-09-19 13:59:20.000000000 +0100
  9.1095 -@@ -101,7 +101,7 @@ static void unlink_clip_vcc(struct clip_
  9.1096 - 		printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n",clip_vcc);
  9.1097 - 		return;
  9.1098 - 	}
  9.1099 --	spin_lock_bh(&entry->neigh->dev->xmit_lock);	/* block clip_start_xmit() */
  9.1100 -+	netif_tx_lock_bh(entry->neigh->dev);	/* block clip_start_xmit() */
  9.1101 - 	entry->neigh->used = jiffies;
  9.1102 - 	for (walk = &entry->vccs; *walk; walk = &(*walk)->next)
  9.1103 - 		if (*walk == clip_vcc) {
  9.1104 -@@ -125,7 +125,7 @@ static void unlink_clip_vcc(struct clip_
  9.1105 - 	printk(KERN_CRIT "ATMARP: unlink_clip_vcc failed (entry %p, vcc "
  9.1106 - 	  "0x%p)\n",entry,clip_vcc);
  9.1107 - out:
  9.1108 --	spin_unlock_bh(&entry->neigh->dev->xmit_lock);
  9.1109 -+	netif_tx_unlock_bh(entry->neigh->dev);
  9.1110 - }
  9.1111 - 
  9.1112 - /* The neighbour entry n->lock is held. */
  9.1113 -diff -pruN ../orig-linux-2.6.16.29/net/bridge/br_device.c ./net/bridge/br_device.c
  9.1114 ---- ../orig-linux-2.6.16.29/net/bridge/br_device.c	2006-09-12 19:02:10.000000000 +0100
  9.1115 -+++ ./net/bridge/br_device.c	2006-09-19 13:59:20.000000000 +0100
  9.1116 -@@ -146,9 +146,9 @@ static int br_set_tx_csum(struct net_dev
  9.1117 - 	struct net_bridge *br = netdev_priv(dev);
  9.1118 - 
  9.1119 - 	if (data)
  9.1120 --		br->feature_mask |= NETIF_F_IP_CSUM;
  9.1121 -+		br->feature_mask |= NETIF_F_NO_CSUM;
  9.1122 - 	else
  9.1123 --		br->feature_mask &= ~NETIF_F_IP_CSUM;
  9.1124 -+		br->feature_mask &= ~NETIF_F_ALL_CSUM;
  9.1125 - 
  9.1126 - 	br_features_recompute(br);
  9.1127 - 	return 0;
  9.1128 -@@ -185,6 +185,6 @@ void br_dev_setup(struct net_device *dev
  9.1129 - 	dev->set_mac_address = br_set_mac_address;
  9.1130 - 	dev->priv_flags = IFF_EBRIDGE;
  9.1131 - 
  9.1132 -- 	dev->features = NETIF_F_SG | NETIF_F_FRAGLIST
  9.1133 -- 		| NETIF_F_HIGHDMA | NETIF_F_TSO | NETIF_F_IP_CSUM;
  9.1134 -+ 	dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
  9.1135 -+ 			NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_GSO_ROBUST;
  9.1136 - }
  9.1137 -diff -pruN ../orig-linux-2.6.16.29/net/bridge/br_forward.c ./net/bridge/br_forward.c
  9.1138 ---- ../orig-linux-2.6.16.29/net/bridge/br_forward.c	2006-09-12 19:02:10.000000000 +0100
  9.1139 -+++ ./net/bridge/br_forward.c	2006-09-19 13:59:20.000000000 +0100
  9.1140 -@@ -32,7 +32,7 @@ static inline int should_deliver(const s
  9.1141 - int br_dev_queue_push_xmit(struct sk_buff *skb)
  9.1142 - {
  9.1143 - 	/* drop mtu oversized packets except tso */
  9.1144 --	if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->tso_size)
  9.1145 -+	if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->gso_size)
  9.1146 - 		kfree_skb(skb);
  9.1147 - 	else {
  9.1148 - #ifdef CONFIG_BRIDGE_NETFILTER
  9.1149 -diff -pruN ../orig-linux-2.6.16.29/net/bridge/br_if.c ./net/bridge/br_if.c
  9.1150 ---- ../orig-linux-2.6.16.29/net/bridge/br_if.c	2006-09-12 19:02:10.000000000 +0100
  9.1151 -+++ ./net/bridge/br_if.c	2006-09-19 13:59:20.000000000 +0100
  9.1152 -@@ -385,17 +385,28 @@ void br_features_recompute(struct net_br
  9.1153 - 	struct net_bridge_port *p;
  9.1154 - 	unsigned long features, checksum;
  9.1155 - 
  9.1156 --	features = br->feature_mask &~ NETIF_F_IP_CSUM;
  9.1157 --	checksum = br->feature_mask & NETIF_F_IP_CSUM;
  9.1158 -+	checksum = br->feature_mask & NETIF_F_ALL_CSUM ? NETIF_F_NO_CSUM : 0;
  9.1159 -+	features = br->feature_mask & ~NETIF_F_ALL_CSUM;
  9.1160 - 
  9.1161 - 	list_for_each_entry(p, &br->port_list, list) {
  9.1162 --		if (!(p->dev->features 
  9.1163 --		      & (NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM)))
  9.1164 -+		unsigned long feature = p->dev->features;
  9.1165 -+
  9.1166 -+		if (checksum & NETIF_F_NO_CSUM && !(feature & NETIF_F_NO_CSUM))
  9.1167 -+			checksum ^= NETIF_F_NO_CSUM | NETIF_F_HW_CSUM;
  9.1168 -+		if (checksum & NETIF_F_HW_CSUM && !(feature & NETIF_F_HW_CSUM))
  9.1169 -+			checksum ^= NETIF_F_HW_CSUM | NETIF_F_IP_CSUM;
  9.1170 -+		if (!(feature & NETIF_F_IP_CSUM))
  9.1171 - 			checksum = 0;
  9.1172 --		features &= p->dev->features;
  9.1173 -+
  9.1174 -+		if (feature & NETIF_F_GSO)
  9.1175 -+			feature |= NETIF_F_TSO;
  9.1176 -+		feature |= NETIF_F_GSO;
  9.1177 -+
  9.1178 -+		features &= feature;
  9.1179 - 	}
  9.1180 - 
  9.1181 --	br->dev->features = features | checksum | NETIF_F_LLTX;
  9.1182 -+	br->dev->features = features | checksum | NETIF_F_LLTX |
  9.1183 -+			    NETIF_F_GSO_ROBUST;
  9.1184 - }
  9.1185 - 
  9.1186 - /* called with RTNL */
  9.1187 -diff -pruN ../orig-linux-2.6.16.29/net/bridge/br_netfilter.c ./net/bridge/br_netfilter.c
  9.1188 ---- ../orig-linux-2.6.16.29/net/bridge/br_netfilter.c	2006-09-12 19:02:10.000000000 +0100
  9.1189 -+++ ./net/bridge/br_netfilter.c	2006-09-19 13:59:20.000000000 +0100
  9.1190 -@@ -743,7 +743,7 @@ static int br_nf_dev_queue_xmit(struct s
  9.1191 - {
  9.1192 - 	if (skb->protocol == htons(ETH_P_IP) &&
  9.1193 - 	    skb->len > skb->dev->mtu &&
  9.1194 --	    !(skb_shinfo(skb)->ufo_size || skb_shinfo(skb)->tso_size))
  9.1195 -+	    !skb_shinfo(skb)->gso_size)
  9.1196 - 		return ip_fragment(skb, br_dev_queue_push_xmit);
  9.1197 - 	else
  9.1198 - 		return br_dev_queue_push_xmit(skb);
  9.1199 -diff -pruN ../orig-linux-2.6.16.29/net/core/dev.c ./net/core/dev.c
  9.1200 ---- ../orig-linux-2.6.16.29/net/core/dev.c	2006-09-12 19:02:10.000000000 +0100
  9.1201 -+++ ./net/core/dev.c	2006-09-19 13:59:20.000000000 +0100
  9.1202 -@@ -115,6 +115,7 @@
  9.1203 - #include <net/iw_handler.h>
  9.1204 - #endif	/* CONFIG_NET_RADIO */
  9.1205 - #include <asm/current.h>
  9.1206 -+#include <linux/err.h>
  9.1207 - 
  9.1208 - /*
  9.1209 -  *	The list of packet types we will receive (as opposed to discard)
  9.1210 -@@ -1032,7 +1033,7 @@ static inline void net_timestamp(struct 
  9.1211 -  *	taps currently in use.
  9.1212 -  */
  9.1213 - 
  9.1214 --void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
  9.1215 -+static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
  9.1216 - {
  9.1217 - 	struct packet_type *ptype;
  9.1218 - 
  9.1219 -@@ -1106,6 +1107,45 @@ out:	
  9.1220 - 	return ret;
  9.1221 - }
  9.1222 - 
  9.1223 -+/**
  9.1224 -+ *	skb_gso_segment - Perform segmentation on skb.
  9.1225 -+ *	@skb: buffer to segment
  9.1226 -+ *	@features: features for the output path (see dev->features)
  9.1227 -+ *
  9.1228 -+ *	This function segments the given skb and returns a list of segments.
  9.1229 -+ *
  9.1230 -+ *	It may return NULL if the skb requires no segmentation.  This is
  9.1231 -+ *	only possible when GSO is used for verifying header integrity.
  9.1232 -+ */
  9.1233 -+struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features)
  9.1234 -+{
  9.1235 -+	struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);
  9.1236 -+	struct packet_type *ptype;
  9.1237 -+	int type = skb->protocol;
  9.1238 -+
  9.1239 -+	BUG_ON(skb_shinfo(skb)->frag_list);
  9.1240 -+	BUG_ON(skb->ip_summed != CHECKSUM_HW);
  9.1241 -+
  9.1242 -+	skb->mac.raw = skb->data;
  9.1243 -+	skb->mac_len = skb->nh.raw - skb->data;
  9.1244 -+	__skb_pull(skb, skb->mac_len);
  9.1245 -+
  9.1246 -+	rcu_read_lock();
  9.1247 -+	list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type) & 15], list) {
  9.1248 -+		if (ptype->type == type && !ptype->dev && ptype->gso_segment) {
  9.1249 -+			segs = ptype->gso_segment(skb, features);
  9.1250 -+			break;
  9.1251 -+		}
  9.1252 -+	}
  9.1253 -+	rcu_read_unlock();
  9.1254 -+
  9.1255 -+	__skb_push(skb, skb->data - skb->mac.raw);
  9.1256 -+
  9.1257 -+	return segs;
  9.1258 -+}
  9.1259 -+
  9.1260 -+EXPORT_SYMBOL(skb_gso_segment);
  9.1261 -+
  9.1262 - /* Take action when hardware reception checksum errors are detected. */
  9.1263 - #ifdef CONFIG_BUG
  9.1264 - void netdev_rx_csum_fault(struct net_device *dev)
  9.1265 -@@ -1142,75 +1182,108 @@ static inline int illegal_highdma(struct
  9.1266 - #define illegal_highdma(dev, skb)	(0)
  9.1267 - #endif
  9.1268 - 
  9.1269 --/* Keep head the same: replace data */
  9.1270 --int __skb_linearize(struct sk_buff *skb, gfp_t gfp_mask)
  9.1271 -+struct dev_gso_cb {
  9.1272 -+	void (*destructor)(struct sk_buff *skb);
  9.1273 -+};
  9.1274 -+
  9.1275 -+#define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
  9.1276 -+
  9.1277 -+static void dev_gso_skb_destructor(struct sk_buff *skb)
  9.1278 -+{
  9.1279 -+	struct dev_gso_cb *cb;
  9.1280 -+
  9.1281 -+	do {
  9.1282 -+		struct sk_buff *nskb = skb->next;
  9.1283 -+
  9.1284 -+		skb->next = nskb->next;
  9.1285 -+		nskb->next = NULL;
  9.1286 -+		kfree_skb(nskb);
  9.1287 -+	} while (skb->next);
  9.1288 -+
  9.1289 -+	cb = DEV_GSO_CB(skb);
  9.1290 -+	if (cb->destructor)
  9.1291 -+		cb->destructor(skb);
  9.1292 -+}
  9.1293 -+
  9.1294 -+/**
  9.1295 -+ *	dev_gso_segment - Perform emulated hardware segmentation on skb.
  9.1296 -+ *	@skb: buffer to segment
  9.1297 -+ *
  9.1298 -+ *	This function segments the given skb and stores the list of segments
  9.1299 -+ *	in skb->next.
  9.1300 -+ */
  9.1301 -+static int dev_gso_segment(struct sk_buff *skb)
  9.1302 - {
  9.1303 --	unsigned int size;
  9.1304 --	u8 *data;
  9.1305 --	long offset;
  9.1306 --	struct skb_shared_info *ninfo;
  9.1307 --	int headerlen = skb->data - skb->head;
  9.1308 --	int expand = (skb->tail + skb->data_len) - skb->end;
  9.1309 --
  9.1310 --	if (skb_shared(skb))
  9.1311 --		BUG();
  9.1312 --
  9.1313 --	if (expand <= 0)
  9.1314 --		expand = 0;
  9.1315 --
  9.1316 --	size = skb->end - skb->head + expand;
  9.1317 --	size = SKB_DATA_ALIGN(size);
  9.1318 --	data = kmalloc(size + sizeof(struct skb_shared_info), gfp_mask);
  9.1319 --	if (!data)
  9.1320 --		return -ENOMEM;
  9.1321 --
  9.1322 --	/* Copy entire thing */
  9.1323 --	if (skb_copy_bits(skb, -headerlen, data, headerlen + skb->len))
  9.1324 --		BUG();
  9.1325 --
  9.1326 --	/* Set up shinfo */
  9.1327 --	ninfo = (struct skb_shared_info*)(data + size);
  9.1328 --	atomic_set(&ninfo->dataref, 1);
  9.1329 --	ninfo->tso_size = skb_shinfo(skb)->tso_size;
  9.1330 --	ninfo->tso_segs = skb_shinfo(skb)->tso_segs;
  9.1331 --	ninfo->nr_frags = 0;
  9.1332 --	ninfo->frag_list = NULL;
  9.1333 --
  9.1334 --	/* Offset between the two in bytes */
  9.1335 --	offset = data - skb->head;
  9.1336 --
  9.1337 --	/* Free old data. */
  9.1338 --	skb_release_data(skb);
  9.1339 --
  9.1340 --	skb->head = data;
  9.1341 --	skb->end  = data + size;
  9.1342 --
  9.1343 --	/* Set up new pointers */
  9.1344 --	skb->h.raw   += offset;
  9.1345 --	skb->nh.raw  += offset;
  9.1346 --	skb->mac.raw += offset;
  9.1347 --	skb->tail    += offset;
  9.1348 --	skb->data    += offset;
  9.1349 -+	struct net_device *dev = skb->dev;
  9.1350 -+	struct sk_buff *segs;
  9.1351 -+	int features = dev->features & ~(illegal_highdma(dev, skb) ?
  9.1352 -+					 NETIF_F_SG : 0);
  9.1353 -+
  9.1354 -+	segs = skb_gso_segment(skb, features);
  9.1355 -+
  9.1356 -+	/* Verifying header integrity only. */
  9.1357 -+	if (!segs)
  9.1358 -+		return 0;
  9.1359 - 
  9.1360 --	/* We are no longer a clone, even if we were. */
  9.1361 --	skb->cloned    = 0;
  9.1362 -+	if (unlikely(IS_ERR(segs)))
  9.1363 -+		return PTR_ERR(segs);
  9.1364 -+
  9.1365 -+	skb->next = segs;
  9.1366 -+	DEV_GSO_CB(skb)->destructor = skb->destructor;
  9.1367 -+	skb->destructor = dev_gso_skb_destructor;
  9.1368 - 
  9.1369 --	skb->tail     += skb->data_len;
  9.1370 --	skb->data_len  = 0;
  9.1371 -+	return 0;
  9.1372 -+}
  9.1373 -+
  9.1374 -+int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
  9.1375 -+{
  9.1376 -+	if (likely(!skb->next)) {
  9.1377 -+		if (netdev_nit)
  9.1378 -+			dev_queue_xmit_nit(skb, dev);
  9.1379 -+
  9.1380 -+		if (netif_needs_gso(dev, skb)) {
  9.1381 -+			if (unlikely(dev_gso_segment(skb)))
  9.1382 -+				goto out_kfree_skb;
  9.1383 -+			if (skb->next)
  9.1384 -+				goto gso;
  9.1385 -+		}
  9.1386 -+
  9.1387 -+		return dev->hard_start_xmit(skb, dev);
  9.1388 -+	}
  9.1389 -+
  9.1390 -+gso:
  9.1391 -+	do {
  9.1392 -+		struct sk_buff *nskb = skb->next;
  9.1393 -+		int rc;
  9.1394 -+
  9.1395 -+		skb->next = nskb->next;
  9.1396 -+		nskb->next = NULL;
  9.1397 -+		rc = dev->hard_start_xmit(nskb, dev);
  9.1398 -+		if (unlikely(rc)) {
  9.1399 -+			nskb->next = skb->next;
  9.1400 -+			skb->next = nskb;
  9.1401 -+			return rc;
  9.1402 -+		}
  9.1403 -+		if (unlikely(netif_queue_stopped(dev) && skb->next))
  9.1404 -+			return NETDEV_TX_BUSY;
  9.1405 -+	} while (skb->next);
  9.1406 -+	
  9.1407 -+	skb->destructor = DEV_GSO_CB(skb)->destructor;
  9.1408 -+
  9.1409 -+out_kfree_skb:
  9.1410 -+	kfree_skb(skb);
  9.1411 - 	return 0;
  9.1412 - }
  9.1413 - 
  9.1414 - #define HARD_TX_LOCK(dev, cpu) {			\
  9.1415 - 	if ((dev->features & NETIF_F_LLTX) == 0) {	\
  9.1416 --		spin_lock(&dev->xmit_lock);		\
  9.1417 --		dev->xmit_lock_owner = cpu;		\
  9.1418 -+		netif_tx_lock(dev);			\
  9.1419 - 	}						\
  9.1420 - }
  9.1421 - 
  9.1422 - #define HARD_TX_UNLOCK(dev) {				\
  9.1423 - 	if ((dev->features & NETIF_F_LLTX) == 0) {	\
  9.1424 --		dev->xmit_lock_owner = -1;		\
  9.1425 --		spin_unlock(&dev->xmit_lock);		\
  9.1426 -+		netif_tx_unlock(dev);			\
  9.1427 - 	}						\
  9.1428 - }
  9.1429 - 
  9.1430 -@@ -1246,9 +1319,13 @@ int dev_queue_xmit(struct sk_buff *skb)
  9.1431 - 	struct Qdisc *q;
  9.1432 - 	int rc = -ENOMEM;
  9.1433 - 
  9.1434 -+	/* GSO will handle the following emulations directly. */
  9.1435 -+	if (netif_needs_gso(dev, skb))
  9.1436 -+		goto gso;
  9.1437 -+
  9.1438 - 	if (skb_shinfo(skb)->frag_list &&
  9.1439 - 	    !(dev->features & NETIF_F_FRAGLIST) &&
  9.1440 --	    __skb_linearize(skb, GFP_ATOMIC))
  9.1441 -+	    __skb_linearize(skb))
  9.1442 - 		goto out_kfree_skb;
  9.1443 - 
  9.1444 - 	/* Fragmented skb is linearized if device does not support SG,
  9.1445 -@@ -1257,25 +1334,26 @@ int dev_queue_xmit(struct sk_buff *skb)
  9.1446 - 	 */
  9.1447 - 	if (skb_shinfo(skb)->nr_frags &&
  9.1448 - 	    (!(dev->features & NETIF_F_SG) || illegal_highdma(dev, skb)) &&
  9.1449 --	    __skb_linearize(skb, GFP_ATOMIC))
  9.1450 -+	    __skb_linearize(skb))
  9.1451 - 		goto out_kfree_skb;
  9.1452 - 
  9.1453 - 	/* If packet is not checksummed and device does not support
  9.1454 - 	 * checksumming for this protocol, complete checksumming here.
  9.1455 - 	 */
  9.1456 - 	if (skb->ip_summed == CHECKSUM_HW &&
  9.1457 --	    (!(dev->features & (NETIF_F_HW_CSUM | NETIF_F_NO_CSUM)) &&
  9.1458 -+	    (!(dev->features & NETIF_F_GEN_CSUM) &&
  9.1459 - 	     (!(dev->features & NETIF_F_IP_CSUM) ||
  9.1460 - 	      skb->protocol != htons(ETH_P_IP))))
  9.1461 - 	      	if (skb_checksum_help(skb, 0))
  9.1462 - 	      		goto out_kfree_skb;
  9.1463 - 
  9.1464 -+gso:
  9.1465 - 	spin_lock_prefetch(&dev->queue_lock);
  9.1466 - 
  9.1467 - 	/* Disable soft irqs for various locks below. Also 
  9.1468 - 	 * stops preemption for RCU. 
  9.1469 - 	 */
  9.1470 --	local_bh_disable(); 
  9.1471 -+	rcu_read_lock_bh(); 
  9.1472 - 
  9.1473 - 	/* Updates of qdisc are serialized by queue_lock. 
  9.1474 - 	 * The struct Qdisc which is pointed to by qdisc is now a 
  9.1475 -@@ -1309,8 +1387,8 @@ int dev_queue_xmit(struct sk_buff *skb)
  9.1476 - 	/* The device has no queue. Common case for software devices:
  9.1477 - 	   loopback, all the sorts of tunnels...
  9.1478 - 
  9.1479 --	   Really, it is unlikely that xmit_lock protection is necessary here.
  9.1480 --	   (f.e. loopback and IP tunnels are clean ignoring statistics
  9.1481 -+	   Really, it is unlikely that netif_tx_lock protection is necessary
  9.1482 -+	   here.  (f.e. loopback and IP tunnels are clean ignoring statistics
  9.1483 - 	   counters.)
  9.1484 - 	   However, it is possible, that they rely on protection
  9.1485 - 	   made by us here.
  9.1486 -@@ -1326,11 +1404,8 @@ int dev_queue_xmit(struct sk_buff *skb)
  9.1487 - 			HARD_TX_LOCK(dev, cpu);
  9.1488 - 
  9.1489 - 			if (!netif_queue_stopped(dev)) {
  9.1490 --				if (netdev_nit)
  9.1491 --					dev_queue_xmit_nit(skb, dev);
  9.1492 --
  9.1493 - 				rc = 0;
  9.1494 --				if (!dev->hard_start_xmit(skb, dev)) {
  9.1495 -+				if (!dev_hard_start_xmit(skb, dev)) {
  9.1496 - 					HARD_TX_UNLOCK(dev);
  9.1497 - 					goto out;
  9.1498 - 				}
  9.1499 -@@ -1349,13 +1424,13 @@ int dev_queue_xmit(struct sk_buff *skb)
  9.1500 - 	}
  9.1501 - 
  9.1502 - 	rc = -ENETDOWN;
  9.1503 --	local_bh_enable();
  9.1504 -+	rcu_read_unlock_bh();
  9.1505 - 
  9.1506 - out_kfree_skb:
  9.1507 - 	kfree_skb(skb);
  9.1508 - 	return rc;
  9.1509 - out:
  9.1510 --	local_bh_enable();
  9.1511 -+	rcu_read_unlock_bh();
  9.1512 - 	return rc;
  9.1513 - }
  9.1514 - 
  9.1515 -@@ -2670,7 +2745,7 @@ int register_netdevice(struct net_device
  9.1516 - 	BUG_ON(dev->reg_state != NETREG_UNINITIALIZED);
  9.1517 - 
  9.1518 - 	spin_lock_init(&dev->queue_lock);
  9.1519 --	spin_lock_init(&dev->xmit_lock);
  9.1520 -+	spin_lock_init(&dev->_xmit_lock);
  9.1521 - 	dev->xmit_lock_owner = -1;
  9.1522 - #ifdef CONFIG_NET_CLS_ACT
  9.1523 - 	spin_lock_init(&dev->ingress_lock);
  9.1524 -@@ -2714,9 +2789,7 @@ int register_netdevice(struct net_device
  9.1525 - 
  9.1526 - 	/* Fix illegal SG+CSUM combinations. */
  9.1527 - 	if ((dev->features & NETIF_F_SG) &&
  9.1528 --	    !(dev->features & (NETIF_F_IP_CSUM |
  9.1529 --			       NETIF_F_NO_CSUM |
  9.1530 --			       NETIF_F_HW_CSUM))) {
  9.1531 -+	    !(dev->features & NETIF_F_ALL_CSUM)) {
  9.1532 - 		printk("%s: Dropping NETIF_F_SG since no checksum feature.\n",
  9.1533 - 		       dev->name);
  9.1534 - 		dev->features &= ~NETIF_F_SG;
  9.1535 -@@ -3268,7 +3341,6 @@ subsys_initcall(net_dev_init);
  9.1536 - EXPORT_SYMBOL(__dev_get_by_index);
  9.1537 - EXPORT_SYMBOL(__dev_get_by_name);
  9.1538 - EXPORT_SYMBOL(__dev_remove_pack);
  9.1539 --EXPORT_SYMBOL(__skb_linearize);
  9.1540 - EXPORT_SYMBOL(dev_valid_name);
  9.1541 - EXPORT_SYMBOL(dev_add_pack);
  9.1542 - EXPORT_SYMBOL(dev_alloc_name);
  9.1543 -diff -pruN ../orig-linux-2.6.16.29/net/core/dev_mcast.c ./net/core/dev_mcast.c
  9.1544 ---- ../orig-linux-2.6.16.29/net/core/dev_mcast.c	2006-09-12 19:02:10.000000000 +0100
  9.1545 -+++ ./net/core/dev_mcast.c	2006-09-19 13:59:20.000000000 +0100
  9.1546 -@@ -62,7 +62,7 @@
  9.1547 -  *	Device mc lists are changed by bh at least if IPv6 is enabled,
  9.1548 -  *	so that it must be bh protected.
  9.1549 -  *
  9.1550 -- *	We block accesses to device mc filters with dev->xmit_lock.
  9.1551 -+ *	We block accesses to device mc filters with netif_tx_lock.
  9.1552 -  */
  9.1553 - 
  9.1554 - /*
  9.1555 -@@ -93,9 +93,9 @@ static void __dev_mc_upload(struct net_d
  9.1556 - 
  9.1557 - void dev_mc_upload(struct net_device *dev)
  9.1558 - {
  9.1559 --	spin_lock_bh(&dev->xmit_lock);
  9.1560 -+	netif_tx_lock_bh(dev);
  9.1561 - 	__dev_mc_upload(dev);
  9.1562 --	spin_unlock_bh(&dev->xmit_lock);
  9.1563 -+	netif_tx_unlock_bh(dev);
  9.1564 - }
  9.1565 - 
  9.1566 - /*
  9.1567 -@@ -107,7 +107,7 @@ int dev_mc_delete(struct net_device *dev
  9.1568 - 	int err = 0;
  9.1569 - 	struct dev_mc_list *dmi, **dmip;
  9.1570 - 
  9.1571 --	spin_lock_bh(&dev->xmit_lock);
  9.1572 -+	netif_tx_lock_bh(dev);
  9.1573 - 
  9.1574 - 	for (dmip = &dev->mc_list; (dmi = *dmip) != NULL; dmip = &dmi->next) {
  9.1575 - 		/*
  9.1576 -@@ -139,13 +139,13 @@ int dev_mc_delete(struct net_device *dev
  9.1577 - 			 */
  9.1578 - 			__dev_mc_upload(dev);
  9.1579 - 			
  9.1580 --			spin_unlock_bh(&dev->xmit_lock);
  9.1581 -+			netif_tx_unlock_bh(dev);
  9.1582 - 			return 0;
  9.1583 - 		}
  9.1584 - 	}
  9.1585 - 	err = -ENOENT;
  9.1586 - done:
  9.1587 --	spin_unlock_bh(&dev->xmit_lock);
  9.1588 -+	netif_tx_unlock_bh(dev);
  9.1589 - 	return err;
  9.1590 - }
  9.1591 - 
  9.1592 -@@ -160,7 +160,7 @@ int dev_mc_add(struct net_device *dev, v
  9.1593 - 
  9.1594 - 	dmi1 = kmalloc(sizeof(*dmi), GFP_ATOMIC);
  9.1595 - 
  9.1596 --	spin_lock_bh(&dev->xmit_lock);
  9.1597 -+	netif_tx_lock_bh(dev);
  9.1598 - 	for (dmi = dev->mc_list; dmi != NULL; dmi = dmi->next) {
  9.1599 - 		if (memcmp(dmi->dmi_addr, addr, dmi->dmi_addrlen) == 0 &&
  9.1600 - 		    dmi->dmi_addrlen == alen) {
  9.1601 -@@ -176,7 +176,7 @@ int dev_mc_add(struct net_device *dev, v
  9.1602 - 	}
  9.1603 - 
  9.1604 - 	if ((dmi = dmi1) == NULL) {
  9.1605 --		spin_unlock_bh(&dev->xmit_lock);
  9.1606 -+		netif_tx_unlock_bh(dev);
  9.1607 - 		return -ENOMEM;
  9.1608 - 	}
  9.1609 - 	memcpy(dmi->dmi_addr, addr, alen);
  9.1610 -@@ -189,11 +189,11 @@ int dev_mc_add(struct net_device *dev, v
  9.1611 - 
  9.1612 - 	__dev_mc_upload(dev);
  9.1613 - 	
  9.1614 --	spin_unlock_bh(&dev->xmit_lock);
  9.1615 -+	netif_tx_unlock_bh(dev);
  9.1616 - 	return 0;
  9.1617 - 
  9.1618 - done:
  9.1619 --	spin_unlock_bh(&dev->xmit_lock);
  9.1620 -+	netif_tx_unlock_bh(dev);
  9.1621 - 	kfree(dmi1);
  9.1622 - 	return err;
  9.1623 - }
  9.1624 -@@ -204,7 +204,7 @@ done:
  9.1625 - 
  9.1626 - void dev_mc_discard(struct net_device *dev)
  9.1627 - {
  9.1628 --	spin_lock_bh(&dev->xmit_lock);
  9.1629 -+	netif_tx_lock_bh(dev);
  9.1630 - 	
  9.1631 - 	while (dev->mc_list != NULL) {
  9.1632 - 		struct dev_mc_list *tmp = dev->mc_list;
  9.1633 -@@ -215,7 +215,7 @@ void dev_mc_discard(struct net_device *d
  9.1634 - 	}
  9.1635 - 	dev->mc_count = 0;
  9.1636 - 
  9.1637 --	spin_unlock_bh(&dev->xmit_lock);
  9.1638 -+	netif_tx_unlock_bh(dev);
  9.1639 - }
  9.1640 - 
  9.1641 - #ifdef CONFIG_PROC_FS
  9.1642 -@@ -250,7 +250,7 @@ static int dev_mc_seq_show(struct seq_fi
  9.1643 - 	struct dev_mc_list *m;
  9.1644 - 	struct net_device *dev = v;
  9.1645 - 
  9.1646 --	spin_lock_bh(&dev->xmit_lock);
  9.1647 -+	netif_tx_lock_bh(dev);
  9.1648 - 	for (m = dev->mc_list; m; m = m->next) {
  9.1649 - 		int i;
  9.1650 - 
  9.1651 -@@ -262,7 +262,7 @@ static int dev_mc_seq_show(struct seq_fi
  9.1652 - 
  9.1653 - 		seq_putc(seq, '\n');
  9.1654 - 	}
  9.1655 --	spin_unlock_bh(&dev->xmit_lock);
  9.1656 -+	netif_tx_unlock_bh(dev);
  9.1657 - 	return 0;
  9.1658 - }
  9.1659 - 
  9.1660 -diff -pruN ../orig-linux-2.6.16.29/net/core/ethtool.c ./net/core/ethtool.c
  9.1661 ---- ../orig-linux-2.6.16.29/net/core/ethtool.c	2006-09-12 19:02:10.000000000 +0100
  9.1662 -+++ ./net/core/ethtool.c	2006-09-19 13:59:20.000000000 +0100
  9.1663 -@@ -30,7 +30,7 @@ u32 ethtool_op_get_link(struct net_devic
  9.1664 - 
  9.1665 - u32 ethtool_op_get_tx_csum(struct net_device *dev)
  9.1666 - {
  9.1667 --	return (dev->features & (NETIF_F_IP_CSUM | NETIF_F_HW_CSUM)) != 0;
  9.1668 -+	return (dev->features & NETIF_F_ALL_CSUM) != 0;
  9.1669 - }
  9.1670 - 
  9.1671 - int ethtool_op_set_tx_csum(struct net_device *dev, u32 data)
  9.1672 -@@ -551,9 +551,7 @@ static int ethtool_set_sg(struct net_dev
  9.1673 - 		return -EFAULT;
  9.1674 - 
  9.1675 - 	if (edata.data && 
  9.1676 --	    !(dev->features & (NETIF_F_IP_CSUM |
  9.1677 --			       NETIF_F_NO_CSUM |
  9.1678 --			       NETIF_F_HW_CSUM)))
  9.1679 -+	    !(dev->features & NETIF_F_ALL_CSUM))
  9.1680 - 		return -EINVAL;
  9.1681 - 
  9.1682 - 	return __ethtool_set_sg(dev, edata.data);
  9.1683 -@@ -561,7 +559,7 @@ static int ethtool_set_sg(struct net_dev
  9.1684 - 
  9.1685 - static int ethtool_get_tso(struct net_device *dev, char __user *useraddr)
  9.1686 - {
  9.1687 --	struct ethtool_value edata = { ETHTOOL_GTSO };
  9.1688 -+	struct ethtool_value edata = { ETHTOOL_GUFO };
  9.1689 - 
  9.1690 - 	if (!dev->ethtool_ops->get_tso)
  9.1691 - 		return -EOPNOTSUPP;
  9.1692 -@@ -616,6 +614,29 @@ static int ethtool_set_ufo(struct net_de
  9.1693 - 	return dev->ethtool_ops->set_ufo(dev, edata.data);
  9.1694 - }
  9.1695 - 
  9.1696 -+static int ethtool_get_gso(struct net_device *dev, char __user *useraddr)
  9.1697 -+{
  9.1698 -+	struct ethtool_value edata = { ETHTOOL_GGSO };
  9.1699 -+
  9.1700 -+	edata.data = dev->features & NETIF_F_GSO;
  9.1701 -+	if (copy_to_user(useraddr, &edata, sizeof(edata)))
  9.1702 -+		 return -EFAULT;
  9.1703 -+	return 0;
  9.1704 -+}
  9.1705 -+
  9.1706 -+static int ethtool_set_gso(struct net_device *dev, char __user *useraddr)
  9.1707 -+{
  9.1708 -+	struct ethtool_value edata;
  9.1709 -+
  9.1710 -+	if (copy_from_user(&edata, useraddr, sizeof(edata)))
  9.1711 -+		return -EFAULT;
  9.1712 -+	if (edata.data)
  9.1713 -+		dev->features |= NETIF_F_GSO;
  9.1714 -+	else
  9.1715 -+		dev->features &= ~NETIF_F_GSO;
  9.1716 -+	return 0;
  9.1717 -+}
  9.1718 -+
  9.1719 - static int ethtool_self_test(struct net_device *dev, char __user *useraddr)
  9.1720 - {
  9.1721 - 	struct ethtool_test test;
  9.1722 -@@ -907,6 +928,12 @@ int dev_ethtool(struct ifreq *ifr)
  9.1723 - 	case ETHTOOL_SUFO:
  9.1724 - 		rc = ethtool_set_ufo(dev, useraddr);
  9.1725 - 		break;
  9.1726 -+	case ETHTOOL_GGSO:
  9.1727 -+		rc = ethtool_get_gso(dev, useraddr);
  9.1728 -+		break;
  9.1729 -+	case ETHTOOL_SGSO:
  9.1730 -+		rc = ethtool_set_gso(dev, useraddr);
  9.1731 -+		break;
  9.1732 - 	default:
  9.1733 - 		rc =  -EOPNOTSUPP;
  9.1734 - 	}
  9.1735 -diff -pruN ../orig-linux-2.6.16.29/net/core/netpoll.c ./net/core/netpoll.c
  9.1736 ---- ../orig-linux-2.6.16.29/net/core/netpoll.c	2006-09-12 19:02:10.000000000 +0100
  9.1737 -+++ ./net/core/netpoll.c	2006-09-19 13:59:20.000000000 +0100
  9.1738 -@@ -273,24 +273,21 @@ static void netpoll_send_skb(struct netp
  9.1739 - 
  9.1740 - 	do {
  9.1741 - 		npinfo->tries--;
  9.1742 --		spin_lock(&np->dev->xmit_lock);
  9.1743 --		np->dev->xmit_lock_owner = smp_processor_id();
  9.1744 -+		netif_tx_lock(np->dev);
  9.1745 - 
  9.1746 - 		/*
  9.1747 - 		 * network drivers do not expect to be called if the queue is
  9.1748 - 		 * stopped.
  9.1749 - 		 */
  9.1750 - 		if (netif_queue_stopped(np->dev)) {
  9.1751 --			np->dev->xmit_lock_owner = -1;
  9.1752 --			spin_unlock(&np->dev->xmit_lock);
  9.1753 -+			netif_tx_unlock(np->dev);
  9.1754 - 			netpoll_poll(np);
  9.1755 - 			udelay(50);
  9.1756 - 			continue;
  9.1757 - 		}
  9.1758 - 
  9.1759 - 		status = np->dev->hard_start_xmit(skb, np->dev);
  9.1760 --		np->dev->xmit_lock_owner = -1;
  9.1761 --		spin_unlock(&np->dev->xmit_lock);
  9.1762 -+		netif_tx_unlock(np->dev);
  9.1763 - 
  9.1764 - 		/* success */
  9.1765 - 		if(!status) {
  9.1766 -diff -pruN ../orig-linux-2.6.16.29/net/core/pktgen.c ./net/core/pktgen.c
  9.1767 ---- ../orig-linux-2.6.16.29/net/core/pktgen.c	2006-09-12 19:02:10.000000000 +0100
  9.1768 -+++ ./net/core/pktgen.c	2006-09-19 13:59:20.000000000 +0100
  9.1769 -@@ -2586,7 +2586,7 @@ static __inline__ void pktgen_xmit(struc
  9.1770 - 		}
  9.1771 - 	}
  9.1772 - 	
  9.1773 --	spin_lock_bh(&odev->xmit_lock);
  9.1774 -+	netif_tx_lock_bh(odev);
  9.1775 - 	if (!netif_queue_stopped(odev)) {
  9.1776 - 
  9.1777 - 		atomic_inc(&(pkt_dev->skb->users));
  9.1778 -@@ -2631,7 +2631,7 @@ retry_now:
  9.1779 - 		pkt_dev->next_tx_ns = 0;
  9.1780 -         }
  9.1781 - 
  9.1782 --	spin_unlock_bh(&odev->xmit_lock);
  9.1783 -+	netif_tx_unlock_bh(odev);
  9.1784 - 	
  9.1785 - 	/* If pkt_dev->count is zero, then run forever */
  9.1786 - 	if ((pkt_dev->count != 0) && (pkt_dev->sofar >= pkt_dev->count)) {
  9.1787 -diff -pruN ../orig-linux-2.6.16.29/net/core/skbuff.c ./net/core/skbuff.c
  9.1788 ---- ../orig-linux-2.6.16.29/net/core/skbuff.c	2006-09-12 19:02:10.000000000 +0100
  9.1789 -+++ ./net/core/skbuff.c	2006-09-19 13:59:20.000000000 +0100
  9.1790 -@@ -164,9 +164,9 @@ struct sk_buff *__alloc_skb(unsigned int
  9.1791 - 	shinfo = skb_shinfo(skb);
  9.1792 - 	atomic_set(&shinfo->dataref, 1);
  9.1793 - 	shinfo->nr_frags  = 0;
  9.1794 --	shinfo->tso_size = 0;
  9.1795 --	shinfo->tso_segs = 0;
  9.1796 --	shinfo->ufo_size = 0;
  9.1797 -+	shinfo->gso_size = 0;
  9.1798 -+	shinfo->gso_segs = 0;
  9.1799 -+	shinfo->gso_type = 0;
  9.1800 - 	shinfo->ip6_frag_id = 0;
  9.1801 - 	shinfo->frag_list = NULL;
  9.1802 - 
  9.1803 -@@ -230,8 +230,9 @@ struct sk_buff *alloc_skb_from_cache(kme
  9.1804 - 
  9.1805 - 	atomic_set(&(skb_shinfo(skb)->dataref), 1);
  9.1806 - 	skb_shinfo(skb)->nr_frags  = 0;
  9.1807 --	skb_shinfo(skb)->tso_size = 0;
  9.1808 --	skb_shinfo(skb)->tso_segs = 0;
  9.1809 -+	skb_shinfo(skb)->gso_size = 0;
  9.1810 -+	skb_shinfo(skb)->gso_segs = 0;
  9.1811 -+	skb_shinfo(skb)->gso_type = 0;
  9.1812 - 	skb_shinfo(skb)->frag_list = NULL;
  9.1813 - out:
  9.1814 - 	return skb;
  9.1815 -@@ -501,8 +502,9 @@ static void copy_skb_header(struct sk_bu
  9.1816 - 	new->tc_index	= old->tc_index;
  9.1817 - #endif
  9.1818 - 	atomic_set(&new->users, 1);
  9.1819 --	skb_shinfo(new)->tso_size = skb_shinfo(old)->tso_size;
  9.1820 --	skb_shinfo(new)->tso_segs = skb_shinfo(old)->tso_segs;
  9.1821 -+	skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
  9.1822 -+	skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
  9.1823 -+	skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type;
  9.1824 - }
  9.1825 - 
  9.1826 - /**
  9.1827 -@@ -1777,6 +1779,133 @@ int skb_append_datato_frags(struct sock 
  9.1828 - 	return 0;
  9.1829 - }
  9.1830 - 
  9.1831 -+/**
  9.1832 -+ *	skb_segment - Perform protocol segmentation on skb.
  9.1833 -+ *	@skb: buffer to segment
  9.1834 -+ *	@features: features for the output path (see dev->features)
  9.1835 -+ *
  9.1836 -+ *	This function performs segmentation on the given skb.  It returns
  9.1837 -+ *	the segment at the given position.  It returns NULL if there are
  9.1838 -+ *	no more segments to generate, or when an error is encountered.
  9.1839 -+ */
  9.1840 -+struct sk_buff *skb_segment(struct sk_buff *skb, int features)
  9.1841 -+{
  9.1842 -+	struct sk_buff *segs = NULL;
  9.1843 -+	struct sk_buff *tail = NULL;
  9.1844 -+	unsigned int mss = skb_shinfo(skb)->gso_size;
  9.1845 -+	unsigned int doffset = skb->data - skb->mac.raw;
  9.1846 -+	unsigned int offset = doffset;
  9.1847 -+	unsigned int headroom;
  9.1848 -+	unsigned int len;
  9.1849 -+	int sg = features & NETIF_F_SG;
  9.1850 -+	int nfrags = skb_shinfo(skb)->nr_frags;
  9.1851 -+	int err = -ENOMEM;
  9.1852 -+	int i = 0;
  9.1853 -+	int pos;
  9.1854 -+
  9.1855 -+	__skb_push(skb, doffset);
  9.1856 -+	headroom = skb_headroom(skb);
  9.1857 -+	pos = skb_headlen(skb);
  9.1858 -+
  9.1859 -+	do {
  9.1860 -+		struct sk_buff *nskb;
  9.1861 -+		skb_frag_t *frag;
  9.1862 -+		int hsize, nsize;
  9.1863 -+		int k;
  9.1864 -+		int size;
  9.1865 -+
  9.1866 -+		len = skb->len - offset;
  9.1867 -+		if (len > mss)
  9.1868 -+			len = mss;
  9.1869 -+
  9.1870 -+		hsize = skb_headlen(skb) - offset;
  9.1871 -+		if (hsize < 0)
  9.1872 -+			hsize = 0;
  9.1873 -+		nsize = hsize + doffset;
  9.1874 -+		if (nsize > len + doffset || !sg)
  9.1875 -+			nsize = len + doffset;
  9.1876 -+
  9.1877 -+		nskb = alloc_skb(nsize + headroom, GFP_ATOMIC);
  9.1878 -+		if (unlikely(!nskb))
  9.1879 -+			goto err;
  9.1880 -+
  9.1881 -+		if (segs)
  9.1882 -+			tail->next = nskb;
  9.1883 -+		else
  9.1884 -+			segs = nskb;
  9.1885 -+		tail = nskb;
  9.1886 -+
  9.1887 -+		nskb->dev = skb->dev;
  9.1888 -+		nskb->priority = skb->priority;
  9.1889 -+		nskb->protocol = skb->protocol;
  9.1890 -+		nskb->dst = dst_clone(skb->dst);
  9.1891 -+		memcpy(nskb->cb, skb->cb, sizeof(skb->cb));
  9.1892 -+		nskb->pkt_type = skb->pkt_type;
  9.1893 -+		nskb->mac_len = skb->mac_len;
  9.1894 -+
  9.1895 -+		skb_reserve(nskb, headroom);
  9.1896 -+		nskb->mac.raw = nskb->data;
  9.1897 -+		nskb->nh.raw = nskb->data + skb->mac_len;
  9.1898 -+		nskb->h.raw = nskb->nh.raw + (skb->h.raw - skb->nh.raw);
  9.1899 -+		memcpy(skb_put(nskb, doffset), skb->data, doffset);
  9.1900 -+
  9.1901 -+		if (!sg) {
  9.1902 -+			nskb->csum = skb_copy_and_csum_bits(skb, offset,
  9.1903 -+							    skb_put(nskb, len),
  9.1904 -+							    len, 0);
  9.1905 -+			continue;
  9.1906 -+		}
  9.1907 -+
  9.1908 -+		frag = skb_shinfo(nskb)->frags;
  9.1909 -+		k = 0;
  9.1910 -+
  9.1911 -+		nskb->ip_summed = CHECKSUM_HW;
  9.1912 -+		nskb->csum = skb->csum;
  9.1913 -+		memcpy(skb_put(nskb, hsize), skb->data + offset, hsize);
  9.1914 -+
  9.1915 -+		while (pos < offset + len) {
  9.1916 -+			BUG_ON(i >= nfrags);
  9.1917 -+
  9.1918 -+			*frag = skb_shinfo(skb)->frags[i];
  9.1919 -+			get_page(frag->page);
  9.1920 -+			size = frag->size;
  9.1921 -+
  9.1922 -+			if (pos < offset) {
  9.1923 -+				frag->page_offset += offset - pos;
  9.1924 -+				frag->size -= offset - pos;
  9.1925 -+			}
  9.1926 -+
  9.1927 -+			k++;
  9.1928 -+
  9.1929 -+			if (pos + size <= offset + len) {
  9.1930 -+				i++;
  9.1931 -+				pos += size;
  9.1932 -+			} else {
  9.1933 -+				frag->size -= pos + size - (offset + len);
  9.1934 -+				break;
  9.1935 -+			}
  9.1936 -+
  9.1937 -+			frag++;
  9.1938 -+		}
  9.1939 -+
  9.1940 -+		skb_shinfo(nskb)->nr_frags = k;
  9.1941 -+		nskb->data_len = len - hsize;
  9.1942 -+		nskb->len += nskb->data_len;
  9.1943 -+		nskb->truesize += nskb->data_len;
  9.1944 -+	} while ((offset += len) < skb->len);
  9.1945 -+
  9.1946 -+	return segs;
  9.1947 -+
  9.1948 -+err:
  9.1949 -+	while ((skb = segs)) {
  9.1950 -+		segs = skb->next;
  9.1951 -+		kfree(skb);
  9.1952 -+	}
  9.1953 -+	return ERR_PTR(err);
  9.1954 -+}
  9.1955 -+
  9.1956 -+EXPORT_SYMBOL_GPL(skb_segment);
  9.1957 -+
  9.1958 - void __init skb_init(void)
  9.1959 - {
  9.1960 - 	skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
  9.1961 -diff -pruN ../orig-linux-2.6.16.29/net/decnet/dn_nsp_in.c ./net/decnet/dn_nsp_in.c
  9.1962 ---- ../orig-linux-2.6.16.29/net/decnet/dn_nsp_in.c	2006-09-12 19:02:10.000000000 +0100
  9.1963 -+++ ./net/decnet/dn_nsp_in.c	2006-09-19 13:59:20.000000000 +0100
  9.1964 -@@ -801,8 +801,7 @@ got_it:
  9.1965 - 		 * We linearize everything except data segments here.
  9.1966 - 		 */
  9.1967 - 		if (cb->nsp_flags & ~0x60) {
  9.1968 --			if (unlikely(skb_is_nonlinear(skb)) &&
  9.1969 --			    skb_linearize(skb, GFP_ATOMIC) != 0)
  9.1970 -+			if (unlikely(skb_linearize(skb)))
  9.1971 - 				goto free_out;
  9.1972 - 		}
  9.1973 - 
  9.1974 -diff -pruN ../orig-linux-2.6.16.29/net/decnet/dn_route.c ./net/decnet/dn_route.c
  9.1975 ---- ../orig-linux-2.6.16.29/net/decnet/dn_route.c	2006-09-12 19:02:10.000000000 +0100
  9.1976 -+++ ./net/decnet/dn_route.c	2006-09-19 13:59:20.000000000 +0100
  9.1977 -@@ -629,8 +629,7 @@ int dn_route_rcv(struct sk_buff *skb, st
  9.1978 - 			padlen);
  9.1979 - 
  9.1980 -         if (flags & DN_RT_PKT_CNTL) {
  9.1981 --		if (unlikely(skb_is_nonlinear(skb)) &&
  9.1982 --		    skb_linearize(skb, GFP_ATOMIC) != 0)
  9.1983 -+		if (unlikely(skb_linearize(skb)))
  9.1984 - 			goto dump_it;
  9.1985 - 
  9.1986 -                 switch(flags & DN_RT_CNTL_MSK) {
  9.1987 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/af_inet.c ./net/ipv4/af_inet.c
  9.1988 ---- ../orig-linux-2.6.16.29/net/ipv4/af_inet.c	2006-09-12 19:02:10.000000000 +0100
  9.1989 -+++ ./net/ipv4/af_inet.c	2006-09-19 13:59:20.000000000 +0100
  9.1990 -@@ -68,6 +68,7 @@
  9.1991 -  */
  9.1992 - 
  9.1993 - #include <linux/config.h>
  9.1994 -+#include <linux/err.h>
  9.1995 - #include <linux/errno.h>
  9.1996 - #include <linux/types.h>
  9.1997 - #include <linux/socket.h>
  9.1998 -@@ -1084,6 +1085,54 @@ int inet_sk_rebuild_header(struct sock *
  9.1999 - 
  9.2000 - EXPORT_SYMBOL(inet_sk_rebuild_header);
  9.2001 - 
  9.2002 -+static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int features)
  9.2003 -+{
  9.2004 -+	struct sk_buff *segs = ERR_PTR(-EINVAL);
  9.2005 -+	struct iphdr *iph;
  9.2006 -+	struct net_protocol *ops;
  9.2007 -+	int proto;
  9.2008 -+	int ihl;
  9.2009 -+	int id;
  9.2010 -+
  9.2011 -+	if (!pskb_may_pull(skb, sizeof(*iph)))
  9.2012 -+		goto out;
  9.2013 -+
  9.2014 -+	iph = skb->nh.iph;
  9.2015 -+	ihl = iph->ihl * 4;
  9.2016 -+	if (ihl < sizeof(*iph))
  9.2017 -+		goto out;
  9.2018 -+
  9.2019 -+	if (!pskb_may_pull(skb, ihl))
  9.2020 -+		goto out;
  9.2021 -+
  9.2022 -+	skb->h.raw = __skb_pull(skb, ihl);
  9.2023 -+	iph = skb->nh.iph;
  9.2024 -+	id = ntohs(iph->id);
  9.2025 -+	proto = iph->protocol & (MAX_INET_PROTOS - 1);
  9.2026 -+	segs = ERR_PTR(-EPROTONOSUPPORT);
  9.2027 -+
  9.2028 -+	rcu_read_lock();
  9.2029 -+	ops = rcu_dereference(inet_protos[proto]);
  9.2030 -+	if (ops && ops->gso_segment)
  9.2031 -+		segs = ops->gso_segment(skb, features);
  9.2032 -+	rcu_read_unlock();
  9.2033 -+
  9.2034 -+	if (!segs || unlikely(IS_ERR(segs)))
  9.2035 -+		goto out;
  9.2036 -+
  9.2037 -+	skb = segs;
  9.2038 -+	do {
  9.2039 -+		iph = skb->nh.iph;
  9.2040 -+		iph->id = htons(id++);
  9.2041 -+		iph->tot_len = htons(skb->len - skb->mac_len);
  9.2042 -+		iph->check = 0;
  9.2043 -+		iph->check = ip_fast_csum(skb->nh.raw, iph->ihl);
  9.2044 -+	} while ((skb = skb->next));
  9.2045 -+
  9.2046 -+out:
  9.2047 -+	return segs;
  9.2048 -+}
  9.2049 -+
  9.2050 - #ifdef CONFIG_IP_MULTICAST
  9.2051 - static struct net_protocol igmp_protocol = {
  9.2052 - 	.handler =	igmp_rcv,
  9.2053 -@@ -1093,6 +1142,7 @@ static struct net_protocol igmp_protocol
  9.2054 - static struct net_protocol tcp_protocol = {
  9.2055 - 	.handler =	tcp_v4_rcv,
  9.2056 - 	.err_handler =	tcp_v4_err,
  9.2057 -+	.gso_segment =	tcp_tso_segment,
  9.2058 - 	.no_policy =	1,
  9.2059 - };
  9.2060 - 
  9.2061 -@@ -1138,6 +1188,7 @@ static int ipv4_proc_init(void);
  9.2062 - static struct packet_type ip_packet_type = {
  9.2063 - 	.type = __constant_htons(ETH_P_IP),
  9.2064 - 	.func = ip_rcv,
  9.2065 -+	.gso_segment = inet_gso_segment,
  9.2066 - };
  9.2067 - 
  9.2068 - static int __init inet_init(void)
  9.2069 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/ip_output.c ./net/ipv4/ip_output.c
  9.2070 ---- ../orig-linux-2.6.16.29/net/ipv4/ip_output.c	2006-09-12 19:02:10.000000000 +0100
  9.2071 -+++ ./net/ipv4/ip_output.c	2006-09-19 13:59:20.000000000 +0100
  9.2072 -@@ -210,8 +210,7 @@ static inline int ip_finish_output(struc
  9.2073 - 		return dst_output(skb);
  9.2074 - 	}
  9.2075 - #endif
  9.2076 --	if (skb->len > dst_mtu(skb->dst) &&
  9.2077 --	    !(skb_shinfo(skb)->ufo_size || skb_shinfo(skb)->tso_size))
  9.2078 -+	if (skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size)
  9.2079 - 		return ip_fragment(skb, ip_finish_output2);
  9.2080 - 	else
  9.2081 - 		return ip_finish_output2(skb);
  9.2082 -@@ -362,7 +361,7 @@ packet_routed:
  9.2083 - 	}
  9.2084 - 
  9.2085 - 	ip_select_ident_more(iph, &rt->u.dst, sk,
  9.2086 --			     (skb_shinfo(skb)->tso_segs ?: 1) - 1);
  9.2087 -+			     (skb_shinfo(skb)->gso_segs ?: 1) - 1);
  9.2088 - 
  9.2089 - 	/* Add an IP checksum. */
  9.2090 - 	ip_send_check(iph);
  9.2091 -@@ -743,7 +742,8 @@ static inline int ip_ufo_append_data(str
  9.2092 - 			       (length - transhdrlen));
  9.2093 - 	if (!err) {
  9.2094 - 		/* specify the length of each IP datagram fragment*/
  9.2095 --		skb_shinfo(skb)->ufo_size = (mtu - fragheaderlen);
  9.2096 -+		skb_shinfo(skb)->gso_size = mtu - fragheaderlen;
  9.2097 -+		skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4;
  9.2098 - 		__skb_queue_tail(&sk->sk_write_queue, skb);
  9.2099 - 
  9.2100 - 		return 0;
  9.2101 -@@ -839,7 +839,7 @@ int ip_append_data(struct sock *sk,
  9.2102 - 	 */
  9.2103 - 	if (transhdrlen &&
  9.2104 - 	    length + fragheaderlen <= mtu &&
  9.2105 --	    rt->u.dst.dev->features&(NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM) &&
  9.2106 -+	    rt->u.dst.dev->features & NETIF_F_ALL_CSUM &&
  9.2107 - 	    !exthdrlen)
  9.2108 - 		csummode = CHECKSUM_HW;
  9.2109 - 
  9.2110 -@@ -1086,14 +1086,16 @@ ssize_t	ip_append_page(struct sock *sk, 
  9.2111 - 
  9.2112 - 	inet->cork.length += size;
  9.2113 - 	if ((sk->sk_protocol == IPPROTO_UDP) &&
  9.2114 --	    (rt->u.dst.dev->features & NETIF_F_UFO))
  9.2115 --		skb_shinfo(skb)->ufo_size = (mtu - fragheaderlen);
  9.2116 -+	    (rt->u.dst.dev->features & NETIF_F_UFO)) {
  9.2117 -+		skb_shinfo(skb)->gso_size = mtu - fragheaderlen;
  9.2118 -+		skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4;
  9.2119 -+	}
  9.2120 - 
  9.2121 - 
  9.2122 - 	while (size > 0) {
  9.2123 - 		int i;
  9.2124 - 
  9.2125 --		if (skb_shinfo(skb)->ufo_size)
  9.2126 -+		if (skb_shinfo(skb)->gso_size)
  9.2127 - 			len = size;
  9.2128 - 		else {
  9.2129 - 
  9.2130 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/ipcomp.c ./net/ipv4/ipcomp.c
  9.2131 ---- ../orig-linux-2.6.16.29/net/ipv4/ipcomp.c	2006-09-12 19:02:10.000000000 +0100
  9.2132 -+++ ./net/ipv4/ipcomp.c	2006-09-19 13:59:20.000000000 +0100
  9.2133 -@@ -84,7 +84,7 @@ static int ipcomp_input(struct xfrm_stat
  9.2134 -                         struct xfrm_decap_state *decap, struct sk_buff *skb)
  9.2135 - {
  9.2136 - 	u8 nexthdr;
  9.2137 --	int err = 0;
  9.2138 -+	int err = -ENOMEM;
  9.2139 - 	struct iphdr *iph;
  9.2140 - 	union {
  9.2141 - 		struct iphdr	iph;
  9.2142 -@@ -92,11 +92,8 @@ static int ipcomp_input(struct xfrm_stat
  9.2143 - 	} tmp_iph;
  9.2144 - 
  9.2145 - 
  9.2146 --	if ((skb_is_nonlinear(skb) || skb_cloned(skb)) &&
  9.2147 --	    skb_linearize(skb, GFP_ATOMIC) != 0) {
  9.2148 --	    	err = -ENOMEM;
  9.2149 -+	if (skb_linearize_cow(skb))
  9.2150 - 	    	goto out;
  9.2151 --	}
  9.2152 - 
  9.2153 - 	skb->ip_summed = CHECKSUM_NONE;
  9.2154 - 
  9.2155 -@@ -171,10 +168,8 @@ static int ipcomp_output(struct xfrm_sta
  9.2156 - 		goto out_ok;
  9.2157 - 	}
  9.2158 - 
  9.2159 --	if ((skb_is_nonlinear(skb) || skb_cloned(skb)) &&
  9.2160 --	    skb_linearize(skb, GFP_ATOMIC) != 0) {
  9.2161 -+	if (skb_linearize_cow(skb))
  9.2162 - 		goto out_ok;
  9.2163 --	}
  9.2164 - 	
  9.2165 - 	err = ipcomp_compress(x, skb);
  9.2166 - 	iph = skb->nh.iph;
  9.2167 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/tcp.c ./net/ipv4/tcp.c
  9.2168 ---- ../orig-linux-2.6.16.29/net/ipv4/tcp.c	2006-09-12 19:02:10.000000000 +0100
  9.2169 -+++ ./net/ipv4/tcp.c	2006-09-19 13:59:20.000000000 +0100
  9.2170 -@@ -257,6 +257,7 @@
  9.2171 - #include <linux/fs.h>
  9.2172 - #include <linux/random.h>
  9.2173 - #include <linux/bootmem.h>
  9.2174 -+#include <linux/err.h>
  9.2175 - 
  9.2176 - #include <net/icmp.h>
  9.2177 - #include <net/tcp.h>
  9.2178 -@@ -570,7 +571,7 @@ new_segment:
  9.2179 - 		skb->ip_summed = CHECKSUM_HW;
  9.2180 - 		tp->write_seq += copy;
  9.2181 - 		TCP_SKB_CB(skb)->end_seq += copy;
  9.2182 --		skb_shinfo(skb)->tso_segs = 0;
  9.2183 -+		skb_shinfo(skb)->gso_segs = 0;
  9.2184 - 
  9.2185 - 		if (!copied)
  9.2186 - 			TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_PSH;
  9.2187 -@@ -621,14 +622,10 @@ ssize_t tcp_sendpage(struct socket *sock
  9.2188 - 	ssize_t res;
  9.2189 - 	struct sock *sk = sock->sk;
  9.2190 - 
  9.2191 --#define TCP_ZC_CSUM_FLAGS (NETIF_F_IP_CSUM | NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
  9.2192 --
  9.2193 - 	if (!(sk->sk_route_caps & NETIF_F_SG) ||
  9.2194 --	    !(sk->sk_route_caps & TCP_ZC_CSUM_FLAGS))
  9.2195 -+	    !(sk->sk_route_caps & NETIF_F_ALL_CSUM))
  9.2196 - 		return sock_no_sendpage(sock, page, offset, size, flags);
  9.2197 - 
  9.2198 --#undef TCP_ZC_CSUM_FLAGS
  9.2199 --
  9.2200 - 	lock_sock(sk);
  9.2201 - 	TCP_CHECK_TIMER(sk);
  9.2202 - 	res = do_tcp_sendpages(sk, &page, offset, size, flags);
  9.2203 -@@ -725,9 +722,7 @@ new_segment:
  9.2204 - 				/*
  9.2205 - 				 * Check whether we can use HW checksum.
  9.2206 - 				 */
  9.2207 --				if (sk->sk_route_caps &
  9.2208 --				    (NETIF_F_IP_CSUM | NETIF_F_NO_CSUM |
  9.2209 --				     NETIF_F_HW_CSUM))
  9.2210 -+				if (sk->sk_route_caps & NETIF_F_ALL_CSUM)
  9.2211 - 					skb->ip_summed = CHECKSUM_HW;
  9.2212 - 
  9.2213 - 				skb_entail(sk, tp, skb);
  9.2214 -@@ -823,7 +818,7 @@ new_segment:
  9.2215 - 
  9.2216 - 			tp->write_seq += copy;
  9.2217 - 			TCP_SKB_CB(skb)->end_seq += copy;
  9.2218 --			skb_shinfo(skb)->tso_segs = 0;
  9.2219 -+			skb_shinfo(skb)->gso_segs = 0;
  9.2220 - 
  9.2221 - 			from += copy;
  9.2222 - 			copied += copy;
  9.2223 -@@ -2026,6 +2021,71 @@ int tcp_getsockopt(struct sock *sk, int 
  9.2224 - }
  9.2225 - 
  9.2226 - 
  9.2227 -+struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features)
  9.2228 -+{
  9.2229 -+	struct sk_buff *segs = ERR_PTR(-EINVAL);
  9.2230 -+	struct tcphdr *th;
  9.2231 -+	unsigned thlen;
  9.2232 -+	unsigned int seq;
  9.2233 -+	unsigned int delta;
  9.2234 -+	unsigned int oldlen;
  9.2235 -+	unsigned int len;
  9.2236 -+
  9.2237 -+	if (!pskb_may_pull(skb, sizeof(*th)))
  9.2238 -+		goto out;
  9.2239 -+
  9.2240 -+	th = skb->h.th;
  9.2241 -+	thlen = th->doff * 4;
  9.2242 -+	if (thlen < sizeof(*th))
  9.2243 -+		goto out;
  9.2244 -+
  9.2245 -+	if (!pskb_may_pull(skb, thlen))
  9.2246 -+		goto out;
  9.2247 -+
  9.2248 -+	segs = NULL;
  9.2249 -+	if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST))
  9.2250 -+		goto out;
  9.2251 -+
  9.2252 -+	oldlen = (u16)~skb->len;
  9.2253 -+	__skb_pull(skb, thlen);
  9.2254 -+
  9.2255 -+	segs = skb_segment(skb, features);
  9.2256 -+	if (IS_ERR(segs))
  9.2257 -+		goto out;
  9.2258 -+
  9.2259 -+	len = skb_shinfo(skb)->gso_size;
  9.2260 -+	delta = htonl(oldlen + (thlen + len));
  9.2261 -+
  9.2262 -+	skb = segs;
  9.2263 -+	th = skb->h.th;
  9.2264 -+	seq = ntohl(th->seq);
  9.2265 -+
  9.2266 -+	do {
  9.2267 -+		th->fin = th->psh = 0;
  9.2268 -+
  9.2269 -+		th->check = ~csum_fold(th->check + delta);
  9.2270 -+		if (skb->ip_summed != CHECKSUM_HW)
  9.2271 -+			th->check = csum_fold(csum_partial(skb->h.raw, thlen,
  9.2272 -+							   skb->csum));
  9.2273 -+
  9.2274 -+		seq += len;
  9.2275 -+		skb = skb->next;
  9.2276 -+		th = skb->h.th;
  9.2277 -+
  9.2278 -+		th->seq = htonl(seq);
  9.2279 -+		th->cwr = 0;
  9.2280 -+	} while (skb->next);
  9.2281 -+
  9.2282 -+	delta = htonl(oldlen + (skb->tail - skb->h.raw) + skb->data_len);
  9.2283 -+	th->check = ~csum_fold(th->check + delta);
  9.2284 -+	if (skb->ip_summed != CHECKSUM_HW)
  9.2285 -+		th->check = csum_fold(csum_partial(skb->h.raw, thlen,
  9.2286 -+						   skb->csum));
  9.2287 -+
  9.2288 -+out:
  9.2289 -+	return segs;
  9.2290 -+}
  9.2291 -+
  9.2292 - extern void __skb_cb_too_small_for_tcp(int, int);
  9.2293 - extern struct tcp_congestion_ops tcp_reno;
  9.2294 - 
  9.2295 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/tcp_input.c ./net/ipv4/tcp_input.c
  9.2296 ---- ../orig-linux-2.6.16.29/net/ipv4/tcp_input.c	2006-09-12 19:02:10.000000000 +0100
  9.2297 -+++ ./net/ipv4/tcp_input.c	2006-09-19 13:59:20.000000000 +0100
  9.2298 -@@ -1072,7 +1072,7 @@ tcp_sacktag_write_queue(struct sock *sk,
  9.2299 - 				else
  9.2300 - 					pkt_len = (end_seq -
  9.2301 - 						   TCP_SKB_CB(skb)->seq);
  9.2302 --				if (tcp_fragment(sk, skb, pkt_len, skb_shinfo(skb)->tso_size))
  9.2303 -+				if (tcp_fragment(sk, skb, pkt_len, skb_shinfo(skb)->gso_size))
  9.2304 - 					break;
  9.2305 - 				pcount = tcp_skb_pcount(skb);
  9.2306 - 			}
  9.2307 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/tcp_output.c ./net/ipv4/tcp_output.c
  9.2308 ---- ../orig-linux-2.6.16.29/net/ipv4/tcp_output.c	2006-09-12 19:02:10.000000000 +0100
  9.2309 -+++ ./net/ipv4/tcp_output.c	2006-09-19 13:59:20.000000000 +0100
  9.2310 -@@ -497,15 +497,17 @@ static void tcp_set_skb_tso_segs(struct 
  9.2311 - 		/* Avoid the costly divide in the normal
  9.2312 - 		 * non-TSO case.
  9.2313 - 		 */
  9.2314 --		skb_shinfo(skb)->tso_segs = 1;
  9.2315 --		skb_shinfo(skb)->tso_size = 0;
  9.2316 -+		skb_shinfo(skb)->gso_segs = 1;
  9.2317 -+		skb_shinfo(skb)->gso_size = 0;
  9.2318 -+		skb_shinfo(skb)->gso_type = 0;
  9.2319 - 	} else {
  9.2320 - 		unsigned int factor;
  9.2321 - 
  9.2322 - 		factor = skb->len + (mss_now - 1);
  9.2323 - 		factor /= mss_now;
  9.2324 --		skb_shinfo(skb)->tso_segs = factor;
  9.2325 --		skb_shinfo(skb)->tso_size = mss_now;
  9.2326 -+		skb_shinfo(skb)->gso_segs = factor;
  9.2327 -+		skb_shinfo(skb)->gso_size = mss_now;
  9.2328 -+		skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
  9.2329 - 	}
  9.2330 - }
  9.2331 - 
  9.2332 -@@ -850,7 +852,7 @@ static int tcp_init_tso_segs(struct sock
  9.2333 - 
  9.2334 - 	if (!tso_segs ||
  9.2335 - 	    (tso_segs > 1 &&
  9.2336 --	     skb_shinfo(skb)->tso_size != mss_now)) {
  9.2337 -+	     tcp_skb_mss(skb) != mss_now)) {
  9.2338 - 		tcp_set_skb_tso_segs(sk, skb, mss_now);
  9.2339 - 		tso_segs = tcp_skb_pcount(skb);
  9.2340 - 	}
  9.2341 -@@ -1510,8 +1512,9 @@ int tcp_retransmit_skb(struct sock *sk, 
  9.2342 - 	   tp->snd_una == (TCP_SKB_CB(skb)->end_seq - 1)) {
  9.2343 - 		if (!pskb_trim(skb, 0)) {
  9.2344 - 			TCP_SKB_CB(skb)->seq = TCP_SKB_CB(skb)->end_seq - 1;
  9.2345 --			skb_shinfo(skb)->tso_segs = 1;
  9.2346 --			skb_shinfo(skb)->tso_size = 0;
  9.2347 -+			skb_shinfo(skb)->gso_segs = 1;
  9.2348 -+			skb_shinfo(skb)->gso_size = 0;
  9.2349 -+			skb_shinfo(skb)->gso_type = 0;
  9.2350 - 			skb->ip_summed = CHECKSUM_NONE;
  9.2351 - 			skb->csum = 0;
  9.2352 - 		}
  9.2353 -@@ -1716,8 +1719,9 @@ void tcp_send_fin(struct sock *sk)
  9.2354 - 		skb->csum = 0;
  9.2355 - 		TCP_SKB_CB(skb)->flags = (TCPCB_FLAG_ACK | TCPCB_FLAG_FIN);
  9.2356 - 		TCP_SKB_CB(skb)->sacked = 0;
  9.2357 --		skb_shinfo(skb)->tso_segs = 1;
  9.2358 --		skb_shinfo(skb)->tso_size = 0;
  9.2359 -+		skb_shinfo(skb)->gso_segs = 1;
  9.2360 -+		skb_shinfo(skb)->gso_size = 0;
  9.2361 -+		skb_shinfo(skb)->gso_type = 0;
  9.2362 - 
  9.2363 - 		/* FIN eats a sequence byte, write_seq advanced by tcp_queue_skb(). */
  9.2364 - 		TCP_SKB_CB(skb)->seq = tp->write_seq;
  9.2365 -@@ -1749,8 +1753,9 @@ void tcp_send_active_reset(struct sock *
  9.2366 - 	skb->csum = 0;
  9.2367 - 	TCP_SKB_CB(skb)->flags = (TCPCB_FLAG_ACK | TCPCB_FLAG_RST);
  9.2368 - 	TCP_SKB_CB(skb)->sacked = 0;
  9.2369 --	skb_shinfo(skb)->tso_segs = 1;
  9.2370 --	skb_shinfo(skb)->tso_size = 0;
  9.2371 -+	skb_shinfo(skb)->gso_segs = 1;
  9.2372 -+	skb_shinfo(skb)->gso_size = 0;
  9.2373 -+	skb_shinfo(skb)->gso_type = 0;
  9.2374 - 
  9.2375 - 	/* Send it off. */
  9.2376 - 	TCP_SKB_CB(skb)->seq = tcp_acceptable_seq(sk, tp);
  9.2377 -@@ -1833,8 +1838,9 @@ struct sk_buff * tcp_make_synack(struct 
  9.2378 - 	TCP_SKB_CB(skb)->seq = tcp_rsk(req)->snt_isn;
  9.2379 - 	TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq + 1;
  9.2380 - 	TCP_SKB_CB(skb)->sacked = 0;
  9.2381 --	skb_shinfo(skb)->tso_segs = 1;
  9.2382 --	skb_shinfo(skb)->tso_size = 0;
  9.2383 -+	skb_shinfo(skb)->gso_segs = 1;
  9.2384 -+	skb_shinfo(skb)->gso_size = 0;
  9.2385 -+	skb_shinfo(skb)->gso_type = 0;
  9.2386 - 	th->seq = htonl(TCP_SKB_CB(skb)->seq);
  9.2387 - 	th->ack_seq = htonl(tcp_rsk(req)->rcv_isn + 1);
  9.2388 - 	if (req->rcv_wnd == 0) { /* ignored for retransmitted syns */
  9.2389 -@@ -1937,8 +1943,9 @@ int tcp_connect(struct sock *sk)
  9.2390 - 	TCP_SKB_CB(buff)->flags = TCPCB_FLAG_SYN;
  9.2391 - 	TCP_ECN_send_syn(sk, tp, buff);
  9.2392 - 	TCP_SKB_CB(buff)->sacked = 0;
  9.2393 --	skb_shinfo(buff)->tso_segs = 1;
  9.2394 --	skb_shinfo(buff)->tso_size = 0;
  9.2395 -+	skb_shinfo(buff)->gso_segs = 1;
  9.2396 -+	skb_shinfo(buff)->gso_size = 0;
  9.2397 -+	skb_shinfo(buff)->gso_type = 0;
  9.2398 - 	buff->csum = 0;
  9.2399 - 	TCP_SKB_CB(buff)->seq = tp->write_seq++;
  9.2400 - 	TCP_SKB_CB(buff)->end_seq = tp->write_seq;
  9.2401 -@@ -2042,8 +2049,9 @@ void tcp_send_ack(struct sock *sk)
  9.2402 - 		buff->csum = 0;
  9.2403 - 		TCP_SKB_CB(buff)->flags = TCPCB_FLAG_ACK;
  9.2404 - 		TCP_SKB_CB(buff)->sacked = 0;
  9.2405 --		skb_shinfo(buff)->tso_segs = 1;
  9.2406 --		skb_shinfo(buff)->tso_size = 0;
  9.2407 -+		skb_shinfo(buff)->gso_segs = 1;
  9.2408 -+		skb_shinfo(buff)->gso_size = 0;
  9.2409 -+		skb_shinfo(buff)->gso_type = 0;
  9.2410 - 
  9.2411 - 		/* Send it off, this clears delayed acks for us. */
  9.2412 - 		TCP_SKB_CB(buff)->seq = TCP_SKB_CB(buff)->end_seq = tcp_acceptable_seq(sk, tp);
  9.2413 -@@ -2078,8 +2086,9 @@ static int tcp_xmit_probe_skb(struct soc
  9.2414 - 	skb->csum = 0;
  9.2415 - 	TCP_SKB_CB(skb)->flags = TCPCB_FLAG_ACK;
  9.2416 - 	TCP_SKB_CB(skb)->sacked = urgent;
  9.2417 --	skb_shinfo(skb)->tso_segs = 1;
  9.2418 --	skb_shinfo(skb)->tso_size = 0;
  9.2419 -+	skb_shinfo(skb)->gso_segs = 1;
  9.2420 -+	skb_shinfo(skb)->gso_size = 0;
  9.2421 -+	skb_shinfo(skb)->gso_type = 0;
  9.2422 - 
  9.2423 - 	/* Use a previous sequence.  This should cause the other
  9.2424 - 	 * end to send an ack.  Don't queue or clone SKB, just
  9.2425 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c ./net/ipv4/xfrm4_output.c
  9.2426 ---- ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c	2006-09-19 13:59:15.000000000 +0100
  9.2427 -+++ ./net/ipv4/xfrm4_output.c	2006-09-19 13:59:20.000000000 +0100
  9.2428 -@@ -9,6 +9,8 @@
  9.2429 -  */
  9.2430 - 
  9.2431 - #include <linux/compiler.h>
  9.2432 -+#include <linux/if_ether.h>
  9.2433 -+#include <linux/kernel.h>
  9.2434 - #include <linux/skbuff.h>
  9.2435 - #include <linux/spinlock.h>
  9.2436 - #include <linux/netfilter_ipv4.h>
  9.2437 -@@ -158,16 +160,10 @@ error_nolock:
  9.2438 - 	goto out_exit;
  9.2439 - }
  9.2440 - 
  9.2441 --static int xfrm4_output_finish(struct sk_buff *skb)
  9.2442 -+static int xfrm4_output_finish2(struct sk_buff *skb)
  9.2443 - {
  9.2444 - 	int err;
  9.2445 - 
  9.2446 --#ifdef CONFIG_NETFILTER
  9.2447 --	if (!skb->dst->xfrm) {
  9.2448 --		IPCB(skb)->flags |= IPSKB_REROUTED;
  9.2449 --		return dst_output(skb);
  9.2450 --	}
  9.2451 --#endif
  9.2452 - 	while (likely((err = xfrm4_output_one(skb)) == 0)) {
  9.2453 - 		nf_reset(skb);
  9.2454 - 
  9.2455 -@@ -180,7 +176,7 @@ static int xfrm4_output_finish(struct sk
  9.2456 - 			return dst_output(skb);
  9.2457 - 
  9.2458 - 		err = nf_hook(PF_INET, NF_IP_POST_ROUTING, &skb, NULL,
  9.2459 --			      skb->dst->dev, xfrm4_output_finish);
  9.2460 -+			      skb->dst->dev, xfrm4_output_finish2);
  9.2461 - 		if (unlikely(err != 1))
  9.2462 - 			break;
  9.2463 - 	}
  9.2464 -@@ -188,6 +184,48 @@ static int xfrm4_output_finish(struct sk
  9.2465 - 	return err;
  9.2466 - }
  9.2467 - 
  9.2468 -+static int xfrm4_output_finish(struct sk_buff *skb)
  9.2469 -+{
  9.2470 -+	struct sk_buff *segs;
  9.2471 -+
  9.2472 -+#ifdef CONFIG_NETFILTER
  9.2473 -+	if (!skb->dst->xfrm) {
  9.2474 -+		IPCB(skb)->flags |= IPSKB_REROUTED;
  9.2475 -+		return dst_output(skb);
  9.2476 -+	}
  9.2477 -+#endif
  9.2478 -+
  9.2479 -+	if (!skb_shinfo(skb)->gso_size)
  9.2480 -+		return xfrm4_output_finish2(skb);
  9.2481 -+
  9.2482 -+	skb->protocol = htons(ETH_P_IP);
  9.2483 -+	segs = skb_gso_segment(skb, 0);
  9.2484 -+	kfree_skb(skb);
  9.2485 -+	if (unlikely(IS_ERR(segs)))
  9.2486 -+		return PTR_ERR(segs);
  9.2487 -+
  9.2488 -+	do {
  9.2489 -+		struct sk_buff *nskb = segs->next;
  9.2490 -+		int err;
  9.2491 -+
  9.2492 -+		segs->next = NULL;
  9.2493 -+		err = xfrm4_output_finish2(segs);
  9.2494 -+
  9.2495 -+		if (unlikely(err)) {
  9.2496 -+			while ((segs = nskb)) {
  9.2497 -+				nskb = segs->next;
  9.2498 -+				segs->next = NULL;
  9.2499 -+				kfree_skb(segs);
  9.2500 -+			}
  9.2501 -+			return err;
  9.2502 -+		}
  9.2503 -+
  9.2504 -+		segs = nskb;
  9.2505 -+	} while (segs);
  9.2506 -+
  9.2507 -+	return 0;
  9.2508 -+}
  9.2509 -+
  9.2510 - int xfrm4_output(struct sk_buff *skb)
  9.2511 - {
  9.2512 - 	return NF_HOOK_COND(PF_INET, NF_IP_POST_ROUTING, skb, NULL, skb->dst->dev,
  9.2513 -diff -pruN ../orig-linux-2.6.16.29/net/ipv6/ip6_output.c ./net/ipv6/ip6_output.c
  9.2514 ---- ../orig-linux-2.6.16.29/net/ipv6/ip6_output.c	2006-09-12 19:02:10.000000000 +0100
  9.2515 -+++ ./net/ipv6/ip6_output.c	2006-09-19 13:59:20.000000000 +0100
  9.2516 -@@ -147,7 +147,7 @@ static int ip6_output2(struct sk_buff *s
  9.2517 - 
  9.2518 - int ip6_output(struct sk_buff *skb)
  9.2519 - {
  9.2520 --	if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->ufo_size) ||
  9.2521 -+	if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size) ||
  9.2522 - 				dst_allfrag(skb->dst))
  9.2523 - 		return ip6_fragment(skb, ip6_output2);
  9.2524 - 	else
  9.2525 -@@ -829,8 +829,9 @@ static inline int ip6_ufo_append_data(st
  9.2526 - 		struct frag_hdr fhdr;
  9.2527 - 
  9.2528 - 		/* specify the length of each IP datagram fragment*/
  9.2529 --		skb_shinfo(skb)->ufo_size = (mtu - fragheaderlen) - 
  9.2530 --						sizeof(struct frag_hdr);
  9.2531 -+		skb_shinfo(skb)->gso_size = mtu - fragheaderlen - 
  9.2532 -+					    sizeof(struct frag_hdr);
  9.2533 -+		skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4;
  9.2534 - 		ipv6_select_ident(skb, &fhdr);
  9.2535 - 		skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
  9.2536 - 		__skb_queue_tail(&sk->sk_write_queue, skb);
  9.2537 -diff -pruN ../orig-linux-2.6.16.29/net/ipv6/ipcomp6.c ./net/ipv6/ipcomp6.c
  9.2538 ---- ../orig-linux-2.6.16.29/net/ipv6/ipcomp6.c	2006-09-12 19:02:10.000000000 +0100
  9.2539 -+++ ./net/ipv6/ipcomp6.c	2006-09-19 13:59:20.000000000 +0100
  9.2540 -@@ -64,7 +64,7 @@ static LIST_HEAD(ipcomp6_tfms_list);
  9.2541 - 
  9.2542 - static int ipcomp6_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb)
  9.2543 - {
  9.2544 --	int err = 0;
  9.2545 -+	int err = -ENOMEM;
  9.2546 - 	u8 nexthdr = 0;
  9.2547 - 	int hdr_len = skb->h.raw - skb->nh.raw;
  9.2548 - 	unsigned char *tmp_hdr = NULL;
  9.2549 -@@ -75,11 +75,8 @@ static int ipcomp6_input(struct xfrm_sta
  9.2550 - 	struct crypto_tfm *tfm;
  9.2551 - 	int cpu;
  9.2552 - 
  9.2553 --	if ((skb_is_nonlinear(skb) || skb_cloned(skb)) &&
  9.2554 --		skb_linearize(skb, GFP_ATOMIC) != 0) {
  9.2555 --		err = -ENOMEM;
  9.2556 -+	if (skb_linearize_cow(skb))
  9.2557 - 		goto out;
  9.2558 --	}
  9.2559 - 
  9.2560 - 	skb->ip_summed = CHECKSUM_NONE;
  9.2561 - 
  9.2562 -@@ -158,10 +155,8 @@ static int ipcomp6_output(struct xfrm_st
  9.2563 - 		goto out_ok;
  9.2564 - 	}
  9.2565 - 
  9.2566 --	if ((skb_is_nonlinear(skb) || skb_cloned(skb)) &&
  9.2567 --		skb_linearize(skb, GFP_ATOMIC) != 0) {
  9.2568 -+	if (skb_linearize_cow(skb))
  9.2569 - 		goto out_ok;
  9.2570 --	}
  9.2571 - 
  9.2572 - 	/* compression */
  9.2573 - 	plen = skb->len - hdr_len;
  9.2574 -diff -pruN ../orig-linux-2.6.16.29/net/ipv6/xfrm6_output.c ./net/ipv6/xfrm6_output.c
  9.2575 ---- ../orig-linux-2.6.16.29/net/ipv6/xfrm6_output.c	2006-09-12 19:02:10.000000000 +0100
  9.2576 -+++ ./net/ipv6/xfrm6_output.c	2006-09-19 13:59:20.000000000 +0100
  9.2577 -@@ -151,7 +151,7 @@ error_nolock:
  9.2578 - 	goto out_exit;
  9.2579 - }
  9.2580 - 
  9.2581 --static int xfrm6_output_finish(struct sk_buff *skb)
  9.2582 -+static int xfrm6_output_finish2(struct sk_buff *skb)
  9.2583 - {
  9.2584 - 	int err;
  9.2585 - 
  9.2586 -@@ -167,7 +167,7 @@ static int xfrm6_output_finish(struct sk
  9.2587 - 			return dst_output(skb);
  9.2588 - 
  9.2589 - 		err = nf_hook(PF_INET6, NF_IP6_POST_ROUTING, &skb, NULL,
  9.2590 --			      skb->dst->dev, xfrm6_output_finish);
  9.2591 -+			      skb->dst->dev, xfrm6_output_finish2);
  9.2592 - 		if (unlikely(err != 1))
  9.2593 - 			break;
  9.2594 - 	}
  9.2595 -@@ -175,6 +175,41 @@ static int xfrm6_output_finish(struct sk
  9.2596 - 	return err;
  9.2597 - }
  9.2598 - 
  9.2599 -+static int xfrm6_output_finish(struct sk_buff *skb)
  9.2600 -+{
  9.2601 -+	struct sk_buff *segs;
  9.2602 -+
  9.2603 -+	if (!skb_shinfo(skb)->gso_size)
  9.2604 -+		return xfrm6_output_finish2(skb);
  9.2605 -+
  9.2606 -+	skb->protocol = htons(ETH_P_IP);
  9.2607 -+	segs = skb_gso_segment(skb, 0);
  9.2608 -+	kfree_skb(skb);
  9.2609 -+	if (unlikely(IS_ERR(segs)))
  9.2610 -+		return PTR_ERR(segs);
  9.2611 -+
  9.2612 -+	do {
  9.2613 -+		struct sk_buff *nskb = segs->next;
  9.2614 -+		int err;
  9.2615 -+
  9.2616 -+		segs->next = NULL;
  9.2617 -+		err = xfrm6_output_finish2(segs);
  9.2618 -+
  9.2619 -+		if (unlikely(err)) {
  9.2620 -+			while ((segs = nskb)) {
  9.2621 -+				nskb = segs->next;
  9.2622 -+				segs->next = NULL;
  9.2623 -+				kfree_skb(segs);
  9.2624 -+			}
  9.2625 -+			return err;
  9.2626 -+		}
  9.2627 -+
  9.2628 -+		segs = nskb;
  9.2629 -+	} while (segs);
  9.2630 -+
  9.2631 -+	return 0;
  9.2632 -+}
  9.2633 -+
  9.2634 - int xfrm6_output(struct sk_buff *skb)
  9.2635 - {
  9.2636 - 	return NF_HOOK(PF_INET6, NF_IP6_POST_ROUTING, skb, NULL, skb->dst->dev,
  9.2637 -diff -pruN ../orig-linux-2.6.16.29/net/sched/sch_generic.c ./net/sched/sch_generic.c
  9.2638 ---- ../orig-linux-2.6.16.29/net/sched/sch_generic.c	2006-09-12 19:02:10.000000000 +0100
  9.2639 -+++ ./net/sched/sch_generic.c	2006-09-19 13:59:20.000000000 +0100
  9.2640 -@@ -72,9 +72,9 @@ void qdisc_unlock_tree(struct net_device
  9.2641 -    dev->queue_lock serializes queue accesses for this device
  9.2642 -    AND dev->qdisc pointer itself.
  9.2643 - 
  9.2644 --   dev->xmit_lock serializes accesses to device driver.
  9.2645 -+   netif_tx_lock serializes accesses to device driver.
  9.2646 - 
  9.2647 --   dev->queue_lock and dev->xmit_lock are mutually exclusive,
  9.2648 -+   dev->queue_lock and netif_tx_lock are mutually exclusive,
  9.2649 -    if one is grabbed, another must be free.
  9.2650 -  */
  9.2651 - 
  9.2652 -@@ -90,14 +90,17 @@ void qdisc_unlock_tree(struct net_device
  9.2653 -    NOTE: Called under dev->queue_lock with locally disabled BH.
  9.2654 - */
  9.2655 - 
  9.2656 --int qdisc_restart(struct net_device *dev)
  9.2657 -+static inline int qdisc_restart(struct net_device *dev)
  9.2658 - {
  9.2659 - 	struct Qdisc *q = dev->qdisc;
  9.2660 - 	struct sk_buff *skb;
  9.2661 - 
  9.2662 - 	/* Dequeue packet */
  9.2663 --	if ((skb = q->dequeue(q)) != NULL) {
  9.2664 -+	if (((skb = dev->gso_skb)) || ((skb = q->dequeue(q)))) {
  9.2665 - 		unsigned nolock = (dev->features & NETIF_F_LLTX);
  9.2666 -+
  9.2667 -+		dev->gso_skb = NULL;
  9.2668 -+
  9.2669 - 		/*
  9.2670 - 		 * When the driver has LLTX set it does its own locking
  9.2671 - 		 * in start_xmit. No need to add additional overhead by
  9.2672 -@@ -108,7 +111,7 @@ int qdisc_restart(struct net_device *dev
  9.2673 - 		 * will be requeued.
  9.2674 - 		 */
  9.2675 - 		if (!nolock) {
  9.2676 --			if (!spin_trylock(&dev->xmit_lock)) {
  9.2677 -+			if (!netif_tx_trylock(dev)) {
  9.2678 - 			collision:
  9.2679 - 				/* So, someone grabbed the driver. */
  9.2680 - 				
  9.2681 -@@ -126,8 +129,6 @@ int qdisc_restart(struct net_device *dev
  9.2682 - 				__get_cpu_var(netdev_rx_stat).cpu_collision++;
  9.2683 - 				goto requeue;
  9.2684 - 			}
  9.2685 --			/* Remember that the driver is grabbed by us. */
  9.2686 --			dev->xmit_lock_owner = smp_processor_id();
  9.2687 - 		}
  9.2688 - 		
  9.2689 - 		{
  9.2690 -@@ -136,14 +137,11 @@ int qdisc_restart(struct net_device *dev
  9.2691 - 
  9.2692 - 			if (!netif_queue_stopped(dev)) {
  9.2693 - 				int ret;
  9.2694 --				if (netdev_nit)
  9.2695 --					dev_queue_xmit_nit(skb, dev);
  9.2696 - 
  9.2697 --				ret = dev->hard_start_xmit(skb, dev);
  9.2698 -+				ret = dev_hard_start_xmit(skb, dev);
  9.2699 - 				if (ret == NETDEV_TX_OK) { 
  9.2700 - 					if (!nolock) {
  9.2701 --						dev->xmit_lock_owner = -1;
  9.2702 --						spin_unlock(&dev->xmit_lock);
  9.2703 -+						netif_tx_unlock(dev);
  9.2704 - 					}
  9.2705 - 					spin_lock(&dev->queue_lock);
  9.2706 - 					return -1;
  9.2707 -@@ -157,8 +155,7 @@ int qdisc_restart(struct net_device *dev
  9.2708 - 			/* NETDEV_TX_BUSY - we need to requeue */
  9.2709 - 			/* Release the driver */
  9.2710 - 			if (!nolock) { 
  9.2711 --				dev->xmit_lock_owner = -1;
  9.2712 --				spin_unlock(&dev->xmit_lock);
  9.2713 -+				netif_tx_unlock(dev);
  9.2714 - 			} 
  9.2715 - 			spin_lock(&dev->queue_lock);
  9.2716 - 			q = dev->qdisc;
  9.2717 -@@ -175,7 +172,10 @@ int qdisc_restart(struct net_device *dev
  9.2718 - 		 */
  9.2719 - 
  9.2720 - requeue:
  9.2721 --		q->ops->requeue(skb, q);
  9.2722 -+		if (skb->next)
  9.2723 -+			dev->gso_skb = skb;
  9.2724 -+		else
  9.2725 -+			q->ops->requeue(skb, q);
  9.2726 - 		netif_schedule(dev);
  9.2727 - 		return 1;
  9.2728 - 	}
  9.2729 -@@ -183,11 +183,23 @@ requeue:
  9.2730 - 	return q->q.qlen;
  9.2731 - }
  9.2732 - 
  9.2733 -+void __qdisc_run(struct net_device *dev)
  9.2734 -+{
  9.2735 -+	if (unlikely(dev->qdisc == &noop_qdisc))
  9.2736 -+		goto out;
  9.2737 -+
  9.2738 -+	while (qdisc_restart(dev) < 0 && !netif_queue_stopped(dev))
  9.2739 -+		/* NOTHING */;
  9.2740 -+
  9.2741 -+out:
  9.2742 -+	clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
  9.2743 -+}
  9.2744 -+
  9.2745 - static void dev_watchdog(unsigned long arg)
  9.2746 - {
  9.2747 - 	struct net_device *dev = (struct net_device *)arg;
  9.2748 - 
  9.2749 --	spin_lock(&dev->xmit_lock);
  9.2750 -+	netif_tx_lock(dev);
  9.2751 - 	if (dev->qdisc != &noop_qdisc) {
  9.2752 - 		if (netif_device_present(dev) &&
  9.2753 - 		    netif_running(dev) &&
  9.2754 -@@ -201,7 +213,7 @@ static void dev_watchdog(unsigned long a
  9.2755 - 				dev_hold(dev);
  9.2756 - 		}
  9.2757 - 	}
  9.2758 --	spin_unlock(&dev->xmit_lock);
  9.2759 -+	netif_tx_unlock(dev);
  9.2760 - 
  9.2761 - 	dev_put(dev);
  9.2762 - }
  9.2763 -@@ -225,17 +237,17 @@ void __netdev_watchdog_up(struct net_dev
  9.2764 - 
  9.2765 - static void dev_watchdog_up(struct net_device *dev)
  9.2766 - {
  9.2767 --	spin_lock_bh(&dev->xmit_lock);
  9.2768 -+	netif_tx_lock_bh(dev);
  9.2769 - 	__netdev_watchdog_up(dev);
  9.2770 --	spin_unlock_bh(&dev->xmit_lock);
  9.2771 -+	netif_tx_unlock_bh(dev);
  9.2772 - }
  9.2773 - 
  9.2774 - static void dev_watchdog_down(struct net_device *dev)
  9.2775 - {
  9.2776 --	spin_lock_bh(&dev->xmit_lock);
  9.2777 -+	netif_tx_lock_bh(dev);
  9.2778 - 	if (del_timer(&dev->watchdog_timer))
  9.2779 - 		__dev_put(dev);
  9.2780 --	spin_unlock_bh(&dev->xmit_lock);
  9.2781 -+	netif_tx_unlock_bh(dev);
  9.2782 - }
  9.2783 - 
  9.2784 - void netif_carrier_on(struct net_device *dev)
  9.2785 -@@ -577,10 +589,17 @@ void dev_deactivate(struct net_device *d
  9.2786 - 
  9.2787 - 	dev_watchdog_down(dev);
  9.2788 - 
  9.2789 --	while (test_bit(__LINK_STATE_SCHED, &dev->state))
  9.2790 -+	/* Wait for outstanding dev_queue_xmit calls. */
  9.2791 -+	synchronize_rcu();
  9.2792 -+
  9.2793 -+	/* Wait for outstanding qdisc_run calls. */
  9.2794 -+	while (test_bit(__LINK_STATE_QDISC_RUNNING, &dev->state))
  9.2795 - 		yield();
  9.2796 - 
  9.2797 --	spin_unlock_wait(&dev->xmit_lock);
  9.2798 -+	if (dev->gso_skb) {
  9.2799 -+		kfree_skb(dev->gso_skb);
  9.2800 -+		dev->gso_skb = NULL;
  9.2801 -+	}
  9.2802 - }
  9.2803 - 
  9.2804 - void dev_init_scheduler(struct net_device *dev)
  9.2805 -@@ -622,6 +641,5 @@ EXPORT_SYMBOL(qdisc_create_dflt);
  9.2806 - EXPORT_SYMBOL(qdisc_alloc);
  9.2807 - EXPORT_SYMBOL(qdisc_destroy);
  9.2808 - EXPORT_SYMBOL(qdisc_reset);
  9.2809 --EXPORT_SYMBOL(qdisc_restart);
  9.2810 - EXPORT_SYMBOL(qdisc_lock_tree);
  9.2811 - EXPORT_SYMBOL(qdisc_unlock_tree);
  9.2812 -diff -pruN ../orig-linux-2.6.16.29/net/sched/sch_teql.c ./net/sched/sch_teql.c
  9.2813 ---- ../orig-linux-2.6.16.29/net/sched/sch_teql.c	2006-09-12 19:02:10.000000000 +0100
  9.2814 -+++ ./net/sched/sch_teql.c	2006-09-19 13:59:20.000000000 +0100
  9.2815 -@@ -302,20 +302,17 @@ restart:
  9.2816 - 
  9.2817 - 		switch (teql_resolve(skb, skb_res, slave)) {
  9.2818 - 		case 0:
  9.2819 --			if (spin_trylock(&slave->xmit_lock)) {
  9.2820 --				slave->xmit_lock_owner = smp_processor_id();
  9.2821 -+			if (netif_tx_trylock(slave)) {
  9.2822 - 				if (!netif_queue_stopped(slave) &&
  9.2823 - 				    slave->hard_start_xmit(skb, slave) == 0) {
  9.2824 --					slave->xmit_lock_owner = -1;
  9.2825 --					spin_unlock(&slave->xmit_lock);
  9.2826 -+					netif_tx_unlock(slave);
  9.2827 - 					master->slaves = NEXT_SLAVE(q);
  9.2828 - 					netif_wake_queue(dev);
  9.2829 - 					master->stats.tx_packets++;
  9.2830 - 					master->stats.tx_bytes += len;
  9.2831 - 					return 0;
  9.2832 - 				}
  9.2833 --				slave->xmit_lock_owner = -1;
  9.2834 --				spin_unlock(&slave->xmit_lock);
  9.2835 -+				netif_tx_unlock(slave);
  9.2836 - 			}
  9.2837 - 			if (netif_queue_stopped(dev))
  9.2838 - 				busy = 1;

    10.1 --- a/patches/linux-2.6.16.29/net-gso-1-check-dodgy.patch	Mon Nov 27 13:22:21 2006 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,27 +0,0 @@
    10.4 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/tcp.c ./net/ipv4/tcp.c
    10.5 ---- ../orig-linux-2.6.16.29/net/ipv4/tcp.c	2006-09-19 13:59:20.000000000 +0100
    10.6 -+++ ./net/ipv4/tcp.c	2006-09-19 13:59:42.000000000 +0100
    10.7 -@@ -2042,13 +2042,19 @@ struct sk_buff *tcp_tso_segment(struct s
    10.8 - 	if (!pskb_may_pull(skb, thlen))
    10.9 - 		goto out;
   10.10 - 
   10.11 --	segs = NULL;
   10.12 --	if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST))
   10.13 --		goto out;
   10.14 --
   10.15 - 	oldlen = (u16)~skb->len;
   10.16 - 	__skb_pull(skb, thlen);
   10.17 - 
   10.18 -+	if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) {
   10.19 -+		/* Packet is from an untrusted source, reset gso_segs. */
   10.20 -+		int mss = skb_shinfo(skb)->gso_size;
   10.21 -+
   10.22 -+		skb_shinfo(skb)->gso_segs = (skb->len + mss - 1) / mss;
   10.23 -+
   10.24 -+		segs = NULL;
   10.25 -+		goto out;
   10.26 -+	}
   10.27 -+
   10.28 - 	segs = skb_segment(skb, features);
   10.29 - 	if (IS_ERR(segs))
   10.30 - 		goto out;

    11.1 --- a/patches/linux-2.6.16.29/net-gso-2-checksum-fix.patch	Mon Nov 27 13:22:21 2006 +0000
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,451 +0,0 @@
    11.4 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/bnx2.c ./drivers/net/bnx2.c
    11.5 ---- ../orig-linux-2.6.16.29/drivers/net/bnx2.c	2006-09-19 13:59:20.000000000 +0100
    11.6 -+++ ./drivers/net/bnx2.c	2006-09-19 13:59:46.000000000 +0100
    11.7 -@@ -1593,7 +1593,7 @@ bnx2_tx_int(struct bnx2 *bp)
    11.8 - 		skb = tx_buf->skb;
    11.9 - #ifdef BCM_TSO 
   11.10 - 		/* partial BD completions possible with TSO packets */
   11.11 --		if (skb_shinfo(skb)->gso_size) {
   11.12 -+		if (skb_is_gso(skb)) {
   11.13 - 			u16 last_idx, last_ring_idx;
   11.14 - 
   11.15 - 			last_idx = sw_cons +
   11.16 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/chelsio/sge.c ./drivers/net/chelsio/sge.c
   11.17 ---- ../orig-linux-2.6.16.29/drivers/net/chelsio/sge.c	2006-09-19 13:59:20.000000000 +0100
   11.18 -+++ ./drivers/net/chelsio/sge.c	2006-09-19 13:59:46.000000000 +0100
   11.19 -@@ -1419,7 +1419,7 @@ int t1_start_xmit(struct sk_buff *skb, s
   11.20 - 	struct cpl_tx_pkt *cpl;
   11.21 - 
   11.22 - #ifdef NETIF_F_TSO
   11.23 --	if (skb_shinfo(skb)->gso_size) {
   11.24 -+	if (skb_is_gso(skb)) {
   11.25 - 		int eth_type;
   11.26 - 		struct cpl_tx_pkt_lso *hdr;
   11.27 - 
   11.28 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/e1000/e1000_main.c ./drivers/net/e1000/e1000_main.c
   11.29 ---- ../orig-linux-2.6.16.29/drivers/net/e1000/e1000_main.c	2006-09-19 13:59:20.000000000 +0100
   11.30 -+++ ./drivers/net/e1000/e1000_main.c	2006-09-19 13:59:46.000000000 +0100
   11.31 -@@ -2526,7 +2526,7 @@ e1000_tso(struct e1000_adapter *adapter,
   11.32 - 	uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
   11.33 - 	int err;
   11.34 - 
   11.35 --	if (skb_shinfo(skb)->gso_size) {
   11.36 -+	if (skb_is_gso(skb)) {
   11.37 - 		if (skb_header_cloned(skb)) {
   11.38 - 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
   11.39 - 			if (err)
   11.40 -@@ -2651,7 +2651,7 @@ e1000_tx_map(struct e1000_adapter *adapt
   11.41 - 		 * tso gets written back prematurely before the data is fully
   11.42 - 		 * DMAd to the controller */
   11.43 - 		if (!skb->data_len && tx_ring->last_tx_tso &&
   11.44 --				!skb_shinfo(skb)->gso_size) {
   11.45 -+		    !skb_is_gso(skb)) {
   11.46 - 			tx_ring->last_tx_tso = 0;
   11.47 - 			size -= 4;
   11.48 - 		}
   11.49 -@@ -2934,8 +2934,7 @@ e1000_xmit_frame(struct sk_buff *skb, st
   11.50 - 
   11.51 - #ifdef NETIF_F_TSO
   11.52 - 	/* Controller Erratum workaround */
   11.53 --	if (!skb->data_len && tx_ring->last_tx_tso &&
   11.54 --		!skb_shinfo(skb)->gso_size)
   11.55 -+	if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
   11.56 - 		count++;
   11.57 - #endif
   11.58 - 
   11.59 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/forcedeth.c ./drivers/net/forcedeth.c
   11.60 ---- ../orig-linux-2.6.16.29/drivers/net/forcedeth.c	2006-09-19 13:59:20.000000000 +0100
   11.61 -+++ ./drivers/net/forcedeth.c	2006-09-19 13:59:46.000000000 +0100
   11.62 -@@ -1105,7 +1105,7 @@ static int nv_start_xmit(struct sk_buff 
   11.63 - 	np->tx_skbuff[nr] = skb;
   11.64 - 
   11.65 - #ifdef NETIF_F_TSO
   11.66 --	if (skb_shinfo(skb)->gso_size)
   11.67 -+	if (skb_is_gso(skb))
   11.68 - 		tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT);
   11.69 - 	else
   11.70 - #endif
   11.71 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/ixgb/ixgb_main.c ./drivers/net/ixgb/ixgb_main.c
   11.72 ---- ../orig-linux-2.6.16.29/drivers/net/ixgb/ixgb_main.c	2006-09-19 13:59:20.000000000 +0100
   11.73 -+++ ./drivers/net/ixgb/ixgb_main.c	2006-09-19 13:59:46.000000000 +0100
   11.74 -@@ -1163,7 +1163,7 @@ ixgb_tso(struct ixgb_adapter *adapter, s
   11.75 - 	uint16_t ipcse, tucse, mss;
   11.76 - 	int err;
   11.77 - 
   11.78 --	if(likely(skb_shinfo(skb)->gso_size)) {
   11.79 -+	if (likely(skb_is_gso(skb))) {
   11.80 - 		if (skb_header_cloned(skb)) {
   11.81 - 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
   11.82 - 			if (err)
   11.83 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/loopback.c ./drivers/net/loopback.c
   11.84 ---- ../orig-linux-2.6.16.29/drivers/net/loopback.c	2006-09-19 13:59:20.000000000 +0100
   11.85 -+++ ./drivers/net/loopback.c	2006-09-19 13:59:46.000000000 +0100
   11.86 -@@ -139,7 +139,7 @@ static int loopback_xmit(struct sk_buff 
   11.87 - #endif
   11.88 - 
   11.89 - #ifdef LOOPBACK_TSO
   11.90 --	if (skb_shinfo(skb)->gso_size) {
   11.91 -+	if (skb_is_gso(skb)) {
   11.92 - 		BUG_ON(skb->protocol != htons(ETH_P_IP));
   11.93 - 		BUG_ON(skb->nh.iph->protocol != IPPROTO_TCP);
   11.94 - 
   11.95 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/sky2.c ./drivers/net/sky2.c
   11.96 ---- ../orig-linux-2.6.16.29/drivers/net/sky2.c	2006-09-19 13:59:20.000000000 +0100
   11.97 -+++ ./drivers/net/sky2.c	2006-09-19 13:59:46.000000000 +0100
   11.98 -@@ -1125,7 +1125,7 @@ static unsigned tx_le_req(const struct s
   11.99 - 	count = sizeof(dma_addr_t) / sizeof(u32);
  11.100 - 	count += skb_shinfo(skb)->nr_frags * count;
  11.101 - 
  11.102 --	if (skb_shinfo(skb)->gso_size)
  11.103 -+	if (skb_is_gso(skb))
  11.104 - 		++count;
  11.105 - 
  11.106 - 	if (skb->ip_summed == CHECKSUM_HW)
  11.107 -diff -pruN ../orig-linux-2.6.16.29/drivers/net/typhoon.c ./drivers/net/typhoon.c
  11.108 ---- ../orig-linux-2.6.16.29/drivers/net/typhoon.c	2006-09-19 13:59:20.000000000 +0100
  11.109 -+++ ./drivers/net/typhoon.c	2006-09-19 13:59:46.000000000 +0100
  11.110 -@@ -805,7 +805,7 @@ typhoon_start_tx(struct sk_buff *skb, st
  11.111 - 	 * If problems develop with TSO, check this first.
  11.112 - 	 */
  11.113 - 	numDesc = skb_shinfo(skb)->nr_frags + 1;
  11.114 --	if(skb_tso_size(skb))
  11.115 -+	if (skb_is_gso(skb))
  11.116 - 		numDesc++;
  11.117 - 
  11.118 - 	/* When checking for free space in the ring, we need to also
  11.119 -@@ -845,7 +845,7 @@ typhoon_start_tx(struct sk_buff *skb, st
  11.120 - 				TYPHOON_TX_PF_VLAN_TAG_SHIFT);
  11.121 - 	}
  11.122 - 
  11.123 --	if(skb_tso_size(skb)) {
  11.124 -+	if (skb_is_gso(skb)) {
  11.125 - 		first_txd->processFlags |= TYPHOON_TX_PF_TCP_SEGMENT;
  11.126 - 		first_txd->numDesc++;
  11.127 - 
  11.128 -diff -pruN ../orig-linux-2.6.16.29/drivers/s390/net/qeth_main.c ./drivers/s390/net/qeth_main.c
  11.129 ---- ../orig-linux-2.6.16.29/drivers/s390/net/qeth_main.c	2006-09-19 13:59:20.000000000 +0100
  11.130 -+++ ./drivers/s390/net/qeth_main.c	2006-09-19 13:59:46.000000000 +0100
  11.131 -@@ -4454,7 +4454,7 @@ qeth_send_packet(struct qeth_card *card,
  11.132 - 	queue = card->qdio.out_qs
  11.133 - 		[qeth_get_priority_queue(card, skb, ipv, cast_type)];
  11.134 - 
  11.135 --	if (skb_shinfo(skb)->gso_size)
  11.136 -+	if (skb_is_gso(skb))
  11.137 - 		large_send = card->options.large_send;
  11.138 - 
  11.139 - 	/*are we able to do TSO ? If so ,prepare and send it from here */
  11.140 -@@ -4501,8 +4501,7 @@ qeth_send_packet(struct qeth_card *card,
  11.141 - 		card->stats.tx_packets++;
  11.142 - 		card->stats.tx_bytes += skb->len;
  11.143 - #ifdef CONFIG_QETH_PERF_STATS
  11.144 --		if (skb_shinfo(skb)->gso_size &&
  11.145 --		   !(large_send == QETH_LARGE_SEND_NO)) {
  11.146 -+		if (skb_is_gso(skb) && !(large_send == QETH_LARGE_SEND_NO)) {
  11.147 - 			card->perf_stats.large_send_bytes += skb->len;
  11.148 - 			card->perf_stats.large_send_cnt++;
  11.149 - 		}
  11.150 -diff -pruN ../orig-linux-2.6.16.29/include/linux/netdevice.h ./include/linux/netdevice.h
  11.151 ---- ../orig-linux-2.6.16.29/include/linux/netdevice.h	2006-09-19 13:59:20.000000000 +0100
  11.152 -+++ ./include/linux/netdevice.h	2006-09-19 13:59:46.000000000 +0100
  11.153 -@@ -541,6 +541,7 @@ struct packet_type {
  11.154 - 					 struct net_device *);
  11.155 - 	struct sk_buff		*(*gso_segment)(struct sk_buff *skb,
  11.156 - 						int features);
  11.157 -+	int			(*gso_send_check)(struct sk_buff *skb);
  11.158 - 	void			*af_packet_priv;
  11.159 - 	struct list_head	list;
  11.160 - };
  11.161 -@@ -1001,14 +1002,15 @@ extern void linkwatch_run_queue(void);
  11.162 - 
  11.163 - static inline int skb_gso_ok(struct sk_buff *skb, int features)
  11.164 - {
  11.165 --	int feature = skb_shinfo(skb)->gso_size ?
  11.166 --		      skb_shinfo(skb)->gso_type << NETIF_F_GSO_SHIFT : 0;
  11.167 -+	int feature = skb_shinfo(skb)->gso_type << NETIF_F_GSO_SHIFT;
  11.168 - 	return (features & feature) == feature;
  11.169 - }
  11.170 - 
  11.171 - static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
  11.172 - {
  11.173 --	return !skb_gso_ok(skb, dev->features);
  11.174 -+	return skb_is_gso(skb) &&
  11.175 -+	       (!skb_gso_ok(skb, dev->features) ||
  11.176 -+		unlikely(skb->ip_summed != CHECKSUM_HW));
  11.177 - }
  11.178 - 
  11.179 - #endif /* __KERNEL__ */
  11.180 -diff -pruN ../orig-linux-2.6.16.29/include/linux/skbuff.h ./include/linux/skbuff.h
  11.181 ---- ../orig-linux-2.6.16.29/include/linux/skbuff.h	2006-09-19 13:59:20.000000000 +0100
  11.182 -+++ ./include/linux/skbuff.h	2006-09-19 13:59:46.000000000 +0100
  11.183 -@@ -1403,5 +1403,10 @@ static inline void nf_bridge_get(struct 
  11.184 - static inline void nf_reset(struct sk_buff *skb) {}
  11.185 - #endif /* CONFIG_NETFILTER */
  11.186 - 
  11.187 -+static inline int skb_is_gso(const struct sk_buff *skb)
  11.188 -+{
  11.189 -+	return skb_shinfo(skb)->gso_size;
  11.190 -+}
  11.191 -+
  11.192 - #endif	/* __KERNEL__ */
  11.193 - #endif	/* _LINUX_SKBUFF_H */
  11.194 -diff -pruN ../orig-linux-2.6.16.29/include/net/protocol.h ./include/net/protocol.h
  11.195 ---- ../orig-linux-2.6.16.29/include/net/protocol.h	2006-09-19 13:59:20.000000000 +0100
  11.196 -+++ ./include/net/protocol.h	2006-09-19 13:59:46.000000000 +0100
  11.197 -@@ -37,6 +37,7 @@
  11.198 - struct net_protocol {
  11.199 - 	int			(*handler)(struct sk_buff *skb);
  11.200 - 	void			(*err_handler)(struct sk_buff *skb, u32 info);
  11.201 -+	int			(*gso_send_check)(struct sk_buff *skb);
  11.202 - 	struct sk_buff	       *(*gso_segment)(struct sk_buff *skb,
  11.203 - 					       int features);
  11.204 - 	int			no_policy;
  11.205 -diff -pruN ../orig-linux-2.6.16.29/include/net/tcp.h ./include/net/tcp.h
  11.206 ---- ../orig-linux-2.6.16.29/include/net/tcp.h	2006-09-19 13:59:20.000000000 +0100
  11.207 -+++ ./include/net/tcp.h	2006-09-19 13:59:46.000000000 +0100
  11.208 -@@ -1063,6 +1063,7 @@ extern struct request_sock_ops tcp_reque
  11.209 - 
  11.210 - extern int tcp_v4_destroy_sock(struct sock *sk);
  11.211 - 
  11.212 -+extern int tcp_v4_gso_send_check(struct sk_buff *skb);
  11.213 - extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features);
  11.214 - 
  11.215 - #ifdef CONFIG_PROC_FS
  11.216 -diff -pruN ../orig-linux-2.6.16.29/net/bridge/br_forward.c ./net/bridge/br_forward.c
  11.217 ---- ../orig-linux-2.6.16.29/net/bridge/br_forward.c	2006-09-19 13:59:20.000000000 +0100
  11.218 -+++ ./net/bridge/br_forward.c	2006-09-19 13:59:46.000000000 +0100
  11.219 -@@ -32,7 +32,7 @@ static inline int should_deliver(const s
  11.220 - int br_dev_queue_push_xmit(struct sk_buff *skb)
  11.221 - {
  11.222 - 	/* drop mtu oversized packets except tso */
  11.223 --	if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->gso_size)
  11.224 -+	if (skb->len > skb->dev->mtu && !skb_is_gso(skb))
  11.225 - 		kfree_skb(skb);
  11.226 - 	else {
  11.227 - #ifdef CONFIG_BRIDGE_NETFILTER
  11.228 -diff -pruN ../orig-linux-2.6.16.29/net/bridge/br_netfilter.c ./net/bridge/br_netfilter.c
  11.229 ---- ../orig-linux-2.6.16.29/net/bridge/br_netfilter.c	2006-09-19 13:59:20.000000000 +0100
  11.230 -+++ ./net/bridge/br_netfilter.c	2006-09-19 13:59:46.000000000 +0100
  11.231 -@@ -743,7 +743,7 @@ static int br_nf_dev_queue_xmit(struct s
  11.232 - {
  11.233 - 	if (skb->protocol == htons(ETH_P_IP) &&
  11.234 - 	    skb->len > skb->dev->mtu &&
  11.235 --	    !skb_shinfo(skb)->gso_size)
  11.236 -+	    !skb_is_gso(skb))
  11.237 - 		return ip_fragment(skb, br_dev_queue_push_xmit);
  11.238 - 	else
  11.239 - 		return br_dev_queue_push_xmit(skb);
  11.240 -diff -pruN ../orig-linux-2.6.16.29/net/core/dev.c ./net/core/dev.c
  11.241 ---- ../orig-linux-2.6.16.29/net/core/dev.c	2006-09-19 13:59:20.000000000 +0100
  11.242 -+++ ./net/core/dev.c	2006-09-19 13:59:46.000000000 +0100
  11.243 -@@ -1083,9 +1083,17 @@ int skb_checksum_help(struct sk_buff *sk
  11.244 - 	unsigned int csum;
  11.245 - 	int ret = 0, offset = skb->h.raw - skb->data;
  11.246 - 
  11.247 --	if (inward) {
  11.248 --		skb->ip_summed = CHECKSUM_NONE;
  11.249 --		goto out;
  11.250 -+	if (inward)
  11.251 -+		goto out_set_summed;
  11.252 -+
  11.253 -+	if (unlikely(skb_shinfo(skb)->gso_size)) {
  11.254 -+		static int warned;
  11.255 -+
  11.256 -+		WARN_ON(!warned);
  11.257 -+		warned = 1;
  11.258 -+
  11.259 -+		/* Let GSO fix up the checksum. */
  11.260 -+		goto out_set_summed;
  11.261 - 	}
  11.262 - 
  11.263 - 	if (skb_cloned(skb)) {
  11.264 -@@ -1102,6 +1110,8 @@ int skb_checksum_help(struct sk_buff *sk
  11.265 - 	BUG_ON(skb->csum + 2 > offset);
  11.266 - 
  11.267 - 	*(u16*)(skb->h.raw + skb->csum) = csum_fold(csum);
  11.268 -+
  11.269 -+out_set_summed:
  11.270 - 	skb->ip_summed = CHECKSUM_NONE;
  11.271 - out:	
  11.272 - 	return ret;
  11.273 -@@ -1122,17 +1132,35 @@ struct sk_buff *skb_gso_segment(struct s
  11.274 - 	struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);
  11.275 - 	struct packet_type *ptype;
  11.276 - 	int type = skb->protocol;
  11.277 -+	int err;
  11.278 - 
  11.279 - 	BUG_ON(skb_shinfo(skb)->frag_list);
  11.280 --	BUG_ON(skb->ip_summed != CHECKSUM_HW);
  11.281 - 
  11.282 - 	skb->mac.raw = skb->data;
  11.283 - 	skb->mac_len = skb->nh.raw - skb->data;
  11.284 - 	__skb_pull(skb, skb->mac_len);
  11.285 - 
  11.286 -+	if (unlikely(skb->ip_summed != CHECKSUM_HW)) {
  11.287 -+		static int warned;
  11.288 -+
  11.289 -+		WARN_ON(!warned);
  11.290 -+		warned = 1;
  11.291 -+
  11.292 -+		if (skb_header_cloned(skb) &&
  11.293 -+		    (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
  11.294 -+			return ERR_PTR(err);
  11.295 -+	}
  11.296 -+
  11.297 - 	rcu_read_lock();
  11.298 - 	list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type) & 15], list) {
  11.299 - 		if (ptype->type == type && !ptype->dev && ptype->gso_segment) {
  11.300 -+			if (unlikely(skb->ip_summed != CHECKSUM_HW)) {
  11.301 -+				err = ptype->gso_send_check(skb);
  11.302 -+				segs = ERR_PTR(err);
  11.303 -+				if (err || skb_gso_ok(skb, features))
  11.304 -+					break;
  11.305 -+				__skb_push(skb, skb->data - skb->nh.raw);
  11.306 -+			}
  11.307 - 			segs = ptype->gso_segment(skb, features);
  11.308 - 			break;
  11.309 - 		}
  11.310 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/af_inet.c ./net/ipv4/af_inet.c
  11.311 ---- ../orig-linux-2.6.16.29/net/ipv4/af_inet.c	2006-09-19 13:59:20.000000000 +0100
  11.312 -+++ ./net/ipv4/af_inet.c	2006-09-19 13:59:46.000000000 +0100
  11.313 -@@ -1085,6 +1085,40 @@ int inet_sk_rebuild_header(struct sock *
  11.314 - 
  11.315 - EXPORT_SYMBOL(inet_sk_rebuild_header);
  11.316 - 
  11.317 -+static int inet_gso_send_check(struct sk_buff *skb)
  11.318 -+{
  11.319 -+	struct iphdr *iph;
  11.320 -+	struct net_protocol *ops;
  11.321 -+	int proto;
  11.322 -+	int ihl;
  11.323 -+	int err = -EINVAL;
  11.324 -+
  11.325 -+	if (unlikely(!pskb_may_pull(skb, sizeof(*iph))))
  11.326 -+		goto out;
  11.327 -+
  11.328 -+	iph = skb->nh.iph;
  11.329 -+	ihl = iph->ihl * 4;
  11.330 -+	if (ihl < sizeof(*iph))
  11.331 -+		goto out;
  11.332 -+
  11.333 -+	if (unlikely(!pskb_may_pull(skb, ihl)))
  11.334 -+		goto out;
  11.335 -+
  11.336 -+	skb->h.raw = __skb_pull(skb, ihl);
  11.337 -+	iph = skb->nh.iph;
  11.338 -+	proto = iph->protocol & (MAX_INET_PROTOS - 1);
  11.339 -+	err = -EPROTONOSUPPORT;
  11.340 -+
  11.341 -+	rcu_read_lock();
  11.342 -+	ops = rcu_dereference(inet_protos[proto]);
  11.343 -+	if (likely(ops && ops->gso_send_check))
  11.344 -+		err = ops->gso_send_check(skb);
  11.345 -+	rcu_read_unlock();
  11.346 -+
  11.347 -+out:
  11.348 -+	return err;
  11.349 -+}
  11.350 -+
  11.351 - static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int features)
  11.352 - {
  11.353 - 	struct sk_buff *segs = ERR_PTR(-EINVAL);
  11.354 -@@ -1142,6 +1176,7 @@ static struct net_protocol igmp_protocol
  11.355 - static struct net_protocol tcp_protocol = {
  11.356 - 	.handler =	tcp_v4_rcv,
  11.357 - 	.err_handler =	tcp_v4_err,
  11.358 -+	.gso_send_check = tcp_v4_gso_send_check,
  11.359 - 	.gso_segment =	tcp_tso_segment,
  11.360 - 	.no_policy =	1,
  11.361 - };
  11.362 -@@ -1188,6 +1223,7 @@ static int ipv4_proc_init(void);
  11.363 - static struct packet_type ip_packet_type = {
  11.364 - 	.type = __constant_htons(ETH_P_IP),
  11.365 - 	.func = ip_rcv,
  11.366 -+	.gso_send_check = inet_gso_send_check,
  11.367 - 	.gso_segment = inet_gso_segment,
  11.368 - };
  11.369 - 
  11.370 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/ip_output.c ./net/ipv4/ip_output.c
  11.371 ---- ../orig-linux-2.6.16.29/net/ipv4/ip_output.c	2006-09-19 13:59:20.000000000 +0100
  11.372 -+++ ./net/ipv4/ip_output.c	2006-09-19 13:59:46.000000000 +0100
  11.373 -@@ -210,7 +210,7 @@ static inline int ip_finish_output(struc
  11.374 - 		return dst_output(skb);
  11.375 - 	}
  11.376 - #endif
  11.377 --	if (skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size)
  11.378 -+	if (skb->len > dst_mtu(skb->dst) && !skb_is_gso(skb))
  11.379 - 		return ip_fragment(skb, ip_finish_output2);
  11.380 - 	else
  11.381 - 		return ip_finish_output2(skb);
  11.382 -@@ -1095,7 +1095,7 @@ ssize_t	ip_append_page(struct sock *sk, 
  11.383 - 	while (size > 0) {
  11.384 - 		int i;
  11.385 - 
  11.386 --		if (skb_shinfo(skb)->gso_size)
  11.387 -+		if (skb_is_gso(skb))
  11.388 - 			len = size;
  11.389 - 		else {
  11.390 - 
  11.391 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/tcp_ipv4.c ./net/ipv4/tcp_ipv4.c
  11.392 ---- ../orig-linux-2.6.16.29/net/ipv4/tcp_ipv4.c	2006-09-12 19:02:10.000000000 +0100
  11.393 -+++ ./net/ipv4/tcp_ipv4.c	2006-09-19 13:59:46.000000000 +0100
  11.394 -@@ -495,6 +495,24 @@ void tcp_v4_send_check(struct sock *sk, 
  11.395 - 	}
  11.396 - }
  11.397 - 
  11.398 -+int tcp_v4_gso_send_check(struct sk_buff *skb)
  11.399 -+{
  11.400 -+	struct iphdr *iph;
  11.401 -+	struct tcphdr *th;
  11.402 -+
  11.403 -+	if (!pskb_may_pull(skb, sizeof(*th)))
  11.404 -+		return -EINVAL;
  11.405 -+
  11.406 -+	iph = skb->nh.iph;
  11.407 -+	th = skb->h.th;
  11.408 -+
  11.409 -+	th->check = 0;
  11.410 -+	th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
  11.411 -+	skb->csum = offsetof(struct tcphdr, check);
  11.412 -+	skb->ip_summed = CHECKSUM_HW;
  11.413 -+	return 0;
  11.414 -+}
  11.415 -+
  11.416 - /*
  11.417 -  *	This routine will send an RST to the other tcp.
  11.418 -  *
  11.419 -diff -pruN ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c ./net/ipv4/xfrm4_output.c
  11.420 ---- ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c	2006-09-19 13:59:20.000000000 +0100
  11.421 -+++ ./net/ipv4/xfrm4_output.c	2006-09-19 13:59:46.000000000 +0100
  11.422 -@@ -195,7 +195,7 @@ static int xfrm4_output_finish(struct sk
  11.423 - 	}
  11.424 - #endif
  11.425 - 
  11.426 --	if (!skb_shinfo(skb)->gso_size)
  11.427 -+	if (!skb_is_gso(skb))
  11.428 - 		return xfrm4_output_finish2(skb);
  11.429 - 
  11.430 - 	skb->protocol = htons(ETH_P_IP);
  11.431 -diff -pruN ../orig-linux-2.6.16.29/net/ipv6/ip6_output.c ./net/ipv6/ip6_output.c
  11.432 ---- ../orig-linux-2.6.16.29/net/ipv6/ip6_output.c	2006-09-19 13:59:20.000000000 +0100
  11.433 -+++ ./net/ipv6/ip6_output.c	2006-09-19 13:59:46.000000000 +0100
  11.434 -@@ -147,7 +147,7 @@ static int ip6_output2(struct sk_buff *s
  11.435 - 
  11.436 - int ip6_output(struct sk_buff *skb)
  11.437 - {
  11.438 --	if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size) ||
  11.439 -+	if ((skb->len > dst_mtu(skb->dst) && !skb_is_gso(skb)) ||
  11.440 - 				dst_allfrag(skb->dst))
  11.441 - 		return ip6_fragment(skb, ip6_output2);
  11.442 - 	else
  11.443 -diff -pruN ../orig-linux-2.6.16.29/net/ipv6/xfrm6_output.c ./net/ipv6/xfrm6_output.c
  11.444 ---- ../orig-linux-2.6.16.29/net/ipv6/xfrm6_output.c	2006-09-19 13:59:20.000000000 +0100
  11.445 -+++ ./net/ipv6/xfrm6_output.c	2006-09-19 13:59:46.000000000 +0100
  11.446 -@@ -179,7 +179,7 @@ static int xfrm6_output_finish(struct sk
  11.447 - {
  11.448 - 	struct sk_buff *segs;
  11.449 - 
  11.450 --	if (!skb_shinfo(skb)->gso_size)
  11.451 -+	if (!skb_is_gso(skb))
  11.452 - 		return xfrm6_output_finish2(skb);
  11.453 - 
  11.454 - 	skb->protocol = htons(ETH_P_IP);

    12.1 --- a/patches/linux-2.6.16.29/net-gso-3-fix-errorcheck.patch	Mon Nov 27 13:22:21 2006 +0000
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,17 +0,0 @@
    12.4 -diff -pruN ../orig-linux-2.6.16.29/include/linux/netdevice.h ./include/linux/netdevice.h
    12.5 ---- ../orig-linux-2.6.16.29/include/linux/netdevice.h	2006-09-19 13:59:46.000000000 +0100
    12.6 -+++ ./include/linux/netdevice.h	2006-09-19 14:05:28.000000000 +0100
    12.7 -@@ -930,10 +930,10 @@ static inline void netif_tx_lock_bh(stru
    12.8 - 
    12.9 - static inline int netif_tx_trylock(struct net_device *dev)
   12.10 - {
   12.11 --	int err = spin_trylock(&dev->_xmit_lock);
   12.12 --	if (!err)
   12.13 -+	int ok = spin_trylock(&dev->_xmit_lock);
   12.14 -+	if (likely(ok))
   12.15 - 		dev->xmit_lock_owner = smp_processor_id();
   12.16 --	return err;
   12.17 -+	return ok;
   12.18 - }
   12.19 - 
   12.20 - static inline void netif_tx_unlock(struct net_device *dev)

    13.1 --- a/patches/linux-2.6.16.29/net-gso-4-kill-warnon.patch	Mon Nov 27 13:22:21 2006 +0000
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,27 +0,0 @@
    13.4 -diff -pruN ../orig-linux-2.6.16.29/net/core/dev.c ./net/core/dev.c
    13.5 ---- ../orig-linux-2.6.16.29/net/core/dev.c	2006-09-19 13:59:46.000000000 +0100
    13.6 -+++ ./net/core/dev.c	2006-09-19 14:05:32.000000000 +0100
    13.7 -@@ -1087,11 +1087,6 @@ int skb_checksum_help(struct sk_buff *sk
    13.8 - 		goto out_set_summed;
    13.9 - 
   13.10 - 	if (unlikely(skb_shinfo(skb)->gso_size)) {
   13.11 --		static int warned;
   13.12 --
   13.13 --		WARN_ON(!warned);
   13.14 --		warned = 1;
   13.15 --
   13.16 - 		/* Let GSO fix up the checksum. */
   13.17 - 		goto out_set_summed;
   13.18 - 	}
   13.19 -@@ -1141,11 +1136,6 @@ struct sk_buff *skb_gso_segment(struct s
   13.20 - 	__skb_pull(skb, skb->mac_len);
   13.21 - 
   13.22 - 	if (unlikely(skb->ip_summed != CHECKSUM_HW)) {
   13.23 --		static int warned;
   13.24 --
   13.25 --		WARN_ON(!warned);
   13.26 --		warned = 1;
   13.27 --
   13.28 - 		if (skb_header_cloned(skb) &&
   13.29 - 		    (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
   13.30 - 			return ERR_PTR(err);

    14.1 --- a/patches/linux-2.6.16.29/net-gso-5-rcv-mss.patch	Mon Nov 27 13:22:21 2006 +0000
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,13 +0,0 @@
    14.4 -diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
    14.5 -index 104af5d..1fa1536 100644
    14.6 ---- a/net/ipv4/tcp_input.c
    14.7 -+++ b/net/ipv4/tcp_input.c
    14.8 -@@ -127,7 +127,7 @@ static void tcp_measure_rcv_mss(struct s
    14.9 - 	/* skb->len may jitter because of SACKs, even if peer
   14.10 - 	 * sends good full-sized frames.
   14.11 - 	 */
   14.12 --	len = skb->len;
   14.13 -+	len = skb_shinfo(skb)->gso_size ?: skb->len;
   14.14 - 	if (len >= icsk->icsk_ack.rcv_mss) {
   14.15 - 		icsk->icsk_ack.rcv_mss = len;
   14.16 - 	} else {

    15.1 --- a/patches/linux-2.6.16.29/pci-mmconfig-fix-from-2.6.17.patch	Mon Nov 27 13:22:21 2006 +0000
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,292 +0,0 @@
    15.4 -diff -pruN ../orig-linux-2.6.16.29/arch/i386/pci/mmconfig.c ./arch/i386/pci/mmconfig.c
    15.5 ---- ../orig-linux-2.6.16.29/arch/i386/pci/mmconfig.c	2006-09-12 19:02:10.000000000 +0100
    15.6 -+++ ./arch/i386/pci/mmconfig.c	2006-09-21 09:35:27.000000000 +0100
    15.7 -@@ -12,14 +12,22 @@
    15.8 - #include <linux/pci.h>
    15.9 - #include <linux/init.h>
   15.10 - #include <linux/acpi.h>
   15.11 -+#include <asm/e820.h>
   15.12 - #include "pci.h"
   15.13 - 
   15.14 -+/* aperture is up to 256MB but BIOS may reserve less */
   15.15 -+#define MMCONFIG_APER_MIN	(2 * 1024*1024)
   15.16 -+#define MMCONFIG_APER_MAX	(256 * 1024*1024)
   15.17 -+
   15.18 -+/* Assume systems with more busses have correct MCFG */
   15.19 -+#define MAX_CHECK_BUS 16
   15.20 -+
   15.21 - #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
   15.22 - 
   15.23 - /* The base address of the last MMCONFIG device accessed */
   15.24 - static u32 mmcfg_last_accessed_device;
   15.25 - 
   15.26 --static DECLARE_BITMAP(fallback_slots, 32);
   15.27 -+static DECLARE_BITMAP(fallback_slots, MAX_CHECK_BUS*32);
   15.28 - 
   15.29 - /*
   15.30 -  * Functions for accessing PCI configuration space with MMCONFIG accesses
   15.31 -@@ -29,8 +37,8 @@ static u32 get_base_addr(unsigned int se
   15.32 - 	int cfg_num = -1;
   15.33 - 	struct acpi_table_mcfg_config *cfg;
   15.34 - 
   15.35 --	if (seg == 0 && bus == 0 &&
   15.36 --	    test_bit(PCI_SLOT(devfn), fallback_slots))
   15.37 -+	if (seg == 0 && bus < MAX_CHECK_BUS &&
   15.38 -+	    test_bit(PCI_SLOT(devfn) + 32*bus, fallback_slots))
   15.39 - 		return 0;
   15.40 - 
   15.41 - 	while (1) {
   15.42 -@@ -74,8 +82,10 @@ static int pci_mmcfg_read(unsigned int s
   15.43 - 	unsigned long flags;
   15.44 - 	u32 base;
   15.45 - 
   15.46 --	if (!value || (bus > 255) || (devfn > 255) || (reg > 4095))
   15.47 -+	if ((bus > 255) || (devfn > 255) || (reg > 4095)) {
   15.48 -+		*value = -1;
   15.49 - 		return -EINVAL;
   15.50 -+	}
   15.51 - 
   15.52 - 	base = get_base_addr(seg, bus, devfn);
   15.53 - 	if (!base)
   15.54 -@@ -146,30 +156,66 @@ static struct pci_raw_ops pci_mmcfg = {
   15.55 -    Normally this can be expressed in the MCFG by not listing them
   15.56 -    and assigning suitable _SEGs, but this isn't implemented in some BIOS.
   15.57 -    Instead try to discover all devices on bus 0 that are unreachable using MM
   15.58 --   and fallback for them.
   15.59 --   We only do this for bus 0/seg 0 */
   15.60 -+   and fallback for them. */
   15.61 - static __init void unreachable_devices(void)
   15.62 - {
   15.63 --	int i;
   15.64 -+	int i, k;
   15.65 - 	unsigned long flags;
   15.66 - 
   15.67 --	for (i = 0; i < 32; i++) {
   15.68 --		u32 val1;
   15.69 --		u32 addr;
   15.70 -+	for (k = 0; k < MAX_CHECK_BUS; k++) {
   15.71 -+		for (i = 0; i < 32; i++) {
   15.72 -+			u32 val1;
   15.73 -+			u32 addr;
   15.74 -+
   15.75 -+			pci_conf1_read(0, k, PCI_DEVFN(i, 0), 0, 4, &val1);
   15.76 -+			if (val1 == 0xffffffff)
   15.77 -+				continue;
   15.78 -+
   15.79 -+			/* Locking probably not needed, but safer */
   15.80 -+			spin_lock_irqsave(&pci_config_lock, flags);
   15.81 -+			addr = get_base_addr(0, k, PCI_DEVFN(i, 0));
   15.82 -+			if (addr != 0)
   15.83 -+				pci_exp_set_dev_base(addr, k, PCI_DEVFN(i, 0));
   15.84 -+			if (addr == 0 ||
   15.85 -+			    readl((u32 __iomem *)mmcfg_virt_addr) != val1) {
   15.86 -+				set_bit(i, fallback_slots);
   15.87 -+				printk(KERN_NOTICE
   15.88 -+			"PCI: No mmconfig possible on %x:%x\n", k, i);
   15.89 -+			}
   15.90 -+			spin_unlock_irqrestore(&pci_config_lock, flags);
   15.91 -+		}
   15.92 -+	}
   15.93 -+}
   15.94 - 
   15.95 --		pci_conf1_read(0, 0, PCI_DEVFN(i, 0), 0, 4, &val1);
   15.96 --		if (val1 == 0xffffffff)
   15.97 -+/* NB. Ripped from arch/i386/kernel/setup.c for this Xen bugfix patch. */
   15.98 -+#ifdef CONFIG_XEN
   15.99 -+extern struct e820map machine_e820;
  15.100 -+#define e820 machine_e820
  15.101 -+#endif
  15.102 -+static int __init
  15.103 -+e820_all_mapped(unsigned long s, unsigned long e, unsigned type)
  15.104 -+{
  15.105 -+	u64 start = s;
  15.106 -+	u64 end = e;
  15.107 -+	int i;
  15.108 -+	for (i = 0; i < e820.nr_map; i++) {
  15.109 -+		struct e820entry *ei = &e820.map[i];
  15.110 -+		if (type && ei->type != type)
  15.111 - 			continue;
  15.112 --
  15.113 --		/* Locking probably not needed, but safer */
  15.114 --		spin_lock_irqsave(&pci_config_lock, flags);
  15.115 --		addr = get_base_addr(0, 0, PCI_DEVFN(i, 0));
  15.116 --		if (addr != 0)
  15.117 --			pci_exp_set_dev_base(addr, 0, PCI_DEVFN(i, 0));
  15.118 --		if (addr == 0 || readl((u32 __iomem *)mmcfg_virt_addr) != val1)
  15.119 --			set_bit(i, fallback_slots);
  15.120 --		spin_unlock_irqrestore(&pci_config_lock, flags);
  15.121 -+		/* is the region (part) in overlap with the current region ?*/
  15.122 -+		if (ei->addr >= end || ei->addr + ei->size <= start)
  15.123 -+			continue;
  15.124 -+		/* if the region is at the beginning of <start,end> we move
  15.125 -+		 * start to the end of the region since it's ok until there
  15.126 -+		 */
  15.127 -+		if (ei->addr <= start)
  15.128 -+			start = ei->addr + ei->size;
  15.129 -+		/* if start is now at or beyond end, we're done, full
  15.130 -+		 * coverage */
  15.131 -+		if (start >= end)
  15.132 -+			return 1; /* we're done */
  15.133 - 	}
  15.134 -+	return 0;
  15.135 - }
  15.136 - 
  15.137 - static int __init pci_mmcfg_init(void)
  15.138 -@@ -183,6 +229,15 @@ static int __init pci_mmcfg_init(void)
  15.139 - 	    (pci_mmcfg_config[0].base_address == 0))
  15.140 - 		goto out;
  15.141 - 
  15.142 -+	if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
  15.143 -+			pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
  15.144 -+			E820_RESERVED)) {
  15.145 -+		printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
  15.146 -+				pci_mmcfg_config[0].base_address);
  15.147 -+		printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
  15.148 -+		goto out;
  15.149 -+	}
  15.150 -+
  15.151 - 	printk(KERN_INFO "PCI: Using MMCONFIG\n");
  15.152 - 	raw_pci_ops = &pci_mmcfg;
  15.153 - 	pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
  15.154 -diff -pruN ../orig-linux-2.6.16.29/arch/x86_64/pci/mmconfig.c ./arch/x86_64/pci/mmconfig.c
  15.155 ---- ../orig-linux-2.6.16.29/arch/x86_64/pci/mmconfig.c	2006-09-12 19:02:10.000000000 +0100
  15.156 -+++ ./arch/x86_64/pci/mmconfig.c	2006-09-21 09:35:40.000000000 +0100
  15.157 -@@ -9,11 +9,19 @@
  15.158 - #include <linux/init.h>
  15.159 - #include <linux/acpi.h>
  15.160 - #include <linux/bitmap.h>
  15.161 -+#include <asm/e820.h>
  15.162 -+
  15.163 - #include "pci.h"
  15.164 - 
  15.165 --#define MMCONFIG_APER_SIZE (256*1024*1024)
  15.166 -+/* aperture is up to 256MB but BIOS may reserve less */
  15.167 -+#define MMCONFIG_APER_MIN	(2 * 1024*1024)
  15.168 -+#define MMCONFIG_APER_MAX	(256 * 1024*1024)
  15.169 -+
  15.170 -+/* Verify the first 16 busses. We assume that systems with more busses
  15.171 -+   get MCFG right. */
  15.172 -+#define MAX_CHECK_BUS 16
  15.173 - 
  15.174 --static DECLARE_BITMAP(fallback_slots, 32);
  15.175 -+static DECLARE_BITMAP(fallback_slots, 32*MAX_CHECK_BUS);
  15.176 - 
  15.177 - /* Static virtual mapping of the MMCONFIG aperture */
  15.178 - struct mmcfg_virt {
  15.179 -@@ -55,7 +63,8 @@ static char __iomem *get_virt(unsigned i
  15.180 - static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)
  15.181 - {
  15.182 - 	char __iomem *addr;
  15.183 --	if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots))
  15.184 -+	if (seg == 0 && bus < MAX_CHECK_BUS &&
  15.185 -+		test_bit(32*bus + PCI_SLOT(devfn), fallback_slots))
  15.186 - 		return NULL;
  15.187 - 	addr = get_virt(seg, bus);
  15.188 - 	if (!addr)
  15.189 -@@ -69,8 +78,10 @@ static int pci_mmcfg_read(unsigned int s
  15.190 - 	char __iomem *addr;
  15.191 - 
  15.192 - 	/* Why do we have this when nobody checks it. How about a BUG()!? -AK */
  15.193 --	if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095)))
  15.194 -+	if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) {
  15.195 -+		*value = -1;
  15.196 - 		return -EINVAL;
  15.197 -+	}
  15.198 - 
  15.199 - 	addr = pci_dev_base(seg, bus, devfn);
  15.200 - 	if (!addr)
  15.201 -@@ -129,23 +140,56 @@ static struct pci_raw_ops pci_mmcfg = {
  15.202 -    Normally this can be expressed in the MCFG by not listing them
  15.203 -    and assigning suitable _SEGs, but this isn't implemented in some BIOS.
  15.204 -    Instead try to discover all devices on bus 0 that are unreachable using MM
  15.205 --   and fallback for them.
  15.206 --   We only do this for bus 0/seg 0 */
  15.207 -+   and fallback for them. */
  15.208 - static __init void unreachable_devices(void)
  15.209 - {
  15.210 --	int i;
  15.211 --	for (i = 0; i < 32; i++) {
  15.212 --		u32 val1;
  15.213 --		char __iomem *addr;
  15.214 -+	int i, k;
  15.215 -+	/* Use the max bus number from ACPI here? */
  15.216 -+	for (k = 0; k < MAX_CHECK_BUS; k++) {
  15.217 -+		for (i = 0; i < 32; i++) {
  15.218 -+			u32 val1;
  15.219 -+			char __iomem *addr;
  15.220 -+
  15.221 -+			pci_conf1_read(0, k, PCI_DEVFN(i,0), 0, 4, &val1);
  15.222 -+			if (val1 == 0xffffffff)
  15.223 -+				continue;
  15.224 -+			addr = pci_dev_base(0, k, PCI_DEVFN(i, 0));
  15.225 -+			if (addr == NULL|| readl(addr) != val1) {
  15.226 -+				set_bit(i + 32*k, fallback_slots);
  15.227 -+				printk(KERN_NOTICE
  15.228 -+				"PCI: No mmconfig possible on device %x:%x\n",
  15.229 -+					k, i);
  15.230 -+			}
  15.231 -+		}
  15.232 -+	}
  15.233 -+}
  15.234 - 
  15.235 --		pci_conf1_read(0, 0, PCI_DEVFN(i,0), 0, 4, &val1);
  15.236 --		if (val1 == 0xffffffff)
  15.237 -+/* NB. Ripped from arch/x86_64/kernel/e820.c for this Xen bugfix patch. */
  15.238 -+#ifdef CONFIG_XEN
  15.239 -+extern struct e820map machine_e820;
  15.240 -+#define e820 machine_e820
  15.241 -+#endif
  15.242 -+static int __init e820_all_mapped(unsigned long start, unsigned long end, unsigned type)
  15.243 -+{
  15.244 -+	int i;
  15.245 -+	for (i = 0; i < e820.nr_map; i++) {
  15.246 -+		struct e820entry *ei = &e820.map[i];
  15.247 -+		if (type && ei->type != type)
  15.248 - 			continue;
  15.249 --		addr = pci_dev_base(0, 0, PCI_DEVFN(i, 0));
  15.250 --		if (addr == NULL|| readl(addr) != val1) {
  15.251 --			set_bit(i, &fallback_slots);
  15.252 --		}
  15.253 -+		/* is the region (part) in overlap with the current region ?*/
  15.254 -+		if (ei->addr >= end || ei->addr + ei->size <= start)
  15.255 -+			continue;
  15.256 -+
  15.257 -+		/* if the region is at the beginning of <start,end> we move
  15.258 -+		 * start to the end of the region since it's ok until there
  15.259 -+		 */
  15.260 -+		if (ei->addr <= start)
  15.261 -+			start = ei->addr + ei->size;
  15.262 -+		/* if start is now at or beyond end, we're done, full coverage */
  15.263 -+		if (start >= end)
  15.264 -+			return 1; /* we're done */
  15.265 - 	}
  15.266 -+	return 0;
  15.267 - }
  15.268 - 
  15.269 - static int __init pci_mmcfg_init(void)
  15.270 -@@ -161,6 +205,15 @@ static int __init pci_mmcfg_init(void)
  15.271 - 	    (pci_mmcfg_config[0].base_address == 0))
  15.272 - 		return 0;
  15.273 - 
  15.274 -+	if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
  15.275 -+			pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
  15.276 -+			E820_RESERVED)) {
  15.277 -+		printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
  15.278 -+				pci_mmcfg_config[0].base_address);
  15.279 -+		printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
  15.280 -+		return 0;
  15.281 -+	}
  15.282 -+
  15.283 - 	/* RED-PEN i386 doesn't do _nocache right now */
  15.284 - 	pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) * pci_mmcfg_config_num, GFP_KERNEL);
  15.285 - 	if (pci_mmcfg_virt == NULL) {
  15.286 -@@ -169,7 +222,8 @@ static int __init pci_mmcfg_init(void)
  15.287 - 	}
  15.288 - 	for (i = 0; i < pci_mmcfg_config_num; ++i) {
  15.289 - 		pci_mmcfg_virt[i].cfg = &pci_mmcfg_config[i];
  15.290 --		pci_mmcfg_virt[i].virt = ioremap_nocache(pci_mmcfg_config[i].base_address, MMCONFIG_APER_SIZE);
  15.291 -+		pci_mmcfg_virt[i].virt = ioremap_nocache(pci_mmcfg_config[i].base_address,
  15.292 -+							 MMCONFIG_APER_MAX);
  15.293 - 		if (!pci_mmcfg_virt[i].virt) {
  15.294 - 			printk("PCI: Cannot map mmconfig aperture for segment %d\n",
  15.295 - 			       pci_mmcfg_config[i].pci_segment_group_number);