|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-3.0.4-testing] [LINUX] Add update to net-gso-0-base.patch which I accidentally missed out of
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1170071032 0
# Node ID 0be1a43e8ec6d566d5ee5b838068add95937d50e
# Parent 4be85bb2f54d62338ddd7b793299ef5381850333
[LINUX] Add update to net-gso-0-base.patch which I accidentally missed out of
the last commit.
The update was to fixup a call to skb_linearize with the old prototype in
net/sctp.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
patches/linux-2.6.16.38/net-gso-0-base.patch | 377 +++++++++++++--------------
1 files changed, 194 insertions(+), 183 deletions(-)
diff -r 4be85bb2f54d -r 0be1a43e8ec6
patches/linux-2.6.16.38/net-gso-0-base.patch
--- a/patches/linux-2.6.16.38/net-gso-0-base.patch Mon Jan 29 10:00:33
2007 +0000
+++ b/patches/linux-2.6.16.38/net-gso-0-base.patch Mon Jan 29 11:43:52
2007 +0000
@@ -1,7 +1,7 @@ Index: tmp-sctp-skb-linearize/Documentat
-Index: tmp-sctp-skb-linearize/Documentation/networking/netdevices.txt
-===================================================================
---- tmp-sctp-skb-linearize.orig/Documentation/networking/netdevices.txt
2007-01-20 17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/Documentation/networking/netdevices.txt
2007-01-26 17:08:56.000000000 +0000
+Index: tmp-sctp/Documentation/networking/netdevices.txt
+===================================================================
+--- tmp-sctp.orig/Documentation/networking/netdevices.txt 2007-01-20
17:54:03.000000000 +0000
++++ tmp-sctp/Documentation/networking/netdevices.txt 2007-01-29
11:41:35.000000000 +0000
@@ -42,9 +42,9 @@
Context: nominally process, but don't sleep inside an rwlock
@@ -29,10 +29,10 @@ Index: tmp-sctp-skb-linearize/Documentat
Context: BHs disabled
dev->poll:
-Index: tmp-sctp-skb-linearize/drivers/block/aoe/aoenet.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/block/aoe/aoenet.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/block/aoe/aoenet.c 2007-01-26
17:08:56.000000000 +0000
+Index: tmp-sctp/drivers/block/aoe/aoenet.c
+===================================================================
+--- tmp-sctp.orig/drivers/block/aoe/aoenet.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/block/aoe/aoenet.c 2007-01-29 11:41:35.000000000
+0000
@@ -95,9 +95,8 @@
static struct sk_buff *
skb_check(struct sk_buff *skb)
@@ -44,10 +44,10 @@ Index: tmp-sctp-skb-linearize/drivers/bl
dev_kfree_skb(skb);
return NULL;
}
-Index: tmp-sctp-skb-linearize/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
2007-01-20 17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
2007-01-26 17:08:56.000000000 +0000
+Index: tmp-sctp/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+===================================================================
+--- tmp-sctp.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2007-01-29
11:41:35.000000000 +0000
@@ -821,7 +821,8 @@
ipoib_mcast_stop_thread(dev, 0);
@@ -68,10 +68,10 @@ Index: tmp-sctp-skb-linearize/drivers/in
/* We have to cancel outside of the spinlock */
list_for_each_entry_safe(mcast, tmcast, &remove_list, list) {
-Index: tmp-sctp-skb-linearize/drivers/media/dvb/dvb-core/dvb_net.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/media/dvb/dvb-core/dvb_net.c
2007-01-20 17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/media/dvb/dvb-core/dvb_net.c
2007-01-26 17:08:56.000000000 +0000
+Index: tmp-sctp/drivers/media/dvb/dvb-core/dvb_net.c
+===================================================================
+--- tmp-sctp.orig/drivers/media/dvb/dvb-core/dvb_net.c 2007-01-20
17:54:03.000000000 +0000
++++ tmp-sctp/drivers/media/dvb/dvb-core/dvb_net.c 2007-01-29
11:41:35.000000000 +0000
@@ -1053,7 +1053,7 @@
dvb_net_feed_stop(dev);
@@ -90,10 +90,10 @@ Index: tmp-sctp-skb-linearize/drivers/me
dvb_net_feed_start(dev);
}
-Index: tmp-sctp-skb-linearize/drivers/net/8139cp.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/8139cp.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/8139cp.c 2007-01-26
17:08:56.000000000 +0000
+Index: tmp-sctp/drivers/net/8139cp.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/8139cp.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/8139cp.c 2007-01-29 11:41:35.000000000 +0000
@@ -794,7 +794,7 @@
entry = cp->tx_head;
eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;
@@ -103,10 +103,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
if (skb_shinfo(skb)->nr_frags == 0) {
struct cp_desc *txd = &cp->tx_ring[entry];
-Index: tmp-sctp-skb-linearize/drivers/net/bnx2.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/bnx2.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/bnx2.c 2007-01-26 17:08:56.000000000
+0000
+Index: tmp-sctp/drivers/net/bnx2.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/bnx2.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/bnx2.c 2007-01-29 11:41:35.000000000 +0000
@@ -1593,7 +1593,7 @@
skb = tx_buf->skb;
#ifdef BCM_TSO
@@ -143,10 +143,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
(skb->len > (bp->dev->mtu + ETH_HLEN))) {
u32 tcp_opt_len, ip_tcp_len;
-Index: tmp-sctp-skb-linearize/drivers/net/bonding/bond_main.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/bonding/bond_main.c
2007-01-20 17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/bonding/bond_main.c 2007-01-26
17:08:56.000000000 +0000
+Index: tmp-sctp/drivers/net/bonding/bond_main.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/bonding/bond_main.c 2007-01-20
17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/bonding/bond_main.c 2007-01-29 11:41:35.000000000
+0000
@@ -1145,8 +1145,7 @@
}
@@ -177,10 +177,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
* transmitting */
bond_dev->features |= NETIF_F_LLTX;
-Index: tmp-sctp-skb-linearize/drivers/net/chelsio/sge.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/chelsio/sge.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/chelsio/sge.c 2007-01-26
17:08:56.000000000 +0000
+Index: tmp-sctp/drivers/net/chelsio/sge.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/chelsio/sge.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/chelsio/sge.c 2007-01-29 11:41:35.000000000 +0000
@@ -1419,7 +1419,7 @@
struct cpl_tx_pkt *cpl;
@@ -199,10 +199,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
hdr->len = htonl(skb->len - sizeof(*hdr));
cpl = (struct cpl_tx_pkt *)hdr;
sge->stats.tx_lso_pkts++;
-Index: tmp-sctp-skb-linearize/drivers/net/e1000/e1000_main.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/e1000/e1000_main.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/e1000/e1000_main.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/e1000/e1000_main.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/e1000/e1000_main.c 2007-01-20
17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/e1000/e1000_main.c 2007-01-29 11:41:35.000000000
+0000
@@ -2526,7 +2526,7 @@
uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
int err;
@@ -248,10 +248,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
count++;
#endif
-Index: tmp-sctp-skb-linearize/drivers/net/forcedeth.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/forcedeth.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/forcedeth.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/forcedeth.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/forcedeth.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/forcedeth.c 2007-01-29 11:41:35.000000000 +0000
@@ -482,9 +482,9 @@
* critical parts:
* - rx is (pseudo-) lockless: it relies on the single-threading provided
@@ -338,10 +338,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
*/
static void nv_set_multicast(struct net_device *dev)
{
-Index: tmp-sctp-skb-linearize/drivers/net/hamradio/6pack.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/hamradio/6pack.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/hamradio/6pack.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/hamradio/6pack.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/hamradio/6pack.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/hamradio/6pack.c 2007-01-29 11:41:35.000000000
+0000
@@ -308,9 +308,9 @@
{
struct sockaddr_ax25 *sa = addr;
@@ -366,10 +366,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
err = 0;
break;
-Index: tmp-sctp-skb-linearize/drivers/net/hamradio/mkiss.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/hamradio/mkiss.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/hamradio/mkiss.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/hamradio/mkiss.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/hamradio/mkiss.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/hamradio/mkiss.c 2007-01-29 11:41:35.000000000
+0000
@@ -357,9 +357,9 @@
{
struct sockaddr_ax25 *sa = addr;
@@ -394,10 +394,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
err = 0;
break;
-Index: tmp-sctp-skb-linearize/drivers/net/ifb.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/ifb.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/ifb.c 2007-01-26 17:08:57.000000000
+0000
+Index: tmp-sctp/drivers/net/ifb.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/ifb.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/ifb.c 2007-01-29 11:41:35.000000000 +0000
@@ -76,13 +76,13 @@
dp->st_task_enter++;
if ((skb = skb_peek(&dp->tq)) == NULL) {
@@ -436,10 +436,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
} else {
resched:
dp->tasklet_pending = 1;
-Index: tmp-sctp-skb-linearize/drivers/net/irda/vlsi_ir.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/irda/vlsi_ir.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/irda/vlsi_ir.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/irda/vlsi_ir.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/irda/vlsi_ir.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/irda/vlsi_ir.c 2007-01-29 11:41:35.000000000
+0000
@@ -959,7 +959,7 @@
|| (now.tv_sec==ready.tv_sec &&
now.tv_usec>=ready.tv_usec))
break;
@@ -449,10 +449,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
}
}
-Index: tmp-sctp-skb-linearize/drivers/net/ixgb/ixgb_main.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/ixgb/ixgb_main.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/ixgb/ixgb_main.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/ixgb/ixgb_main.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/ixgb/ixgb_main.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/ixgb/ixgb_main.c 2007-01-29 11:41:35.000000000
+0000
@@ -1163,7 +1163,7 @@
uint16_t ipcse, tucse, mss;
int err;
@@ -471,10 +471,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
skb->nh.iph->tot_len = 0;
skb->nh.iph->check = 0;
skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
-Index: tmp-sctp-skb-linearize/drivers/net/loopback.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/loopback.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/loopback.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/loopback.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/loopback.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/loopback.c 2007-01-29 11:41:35.000000000 +0000
@@ -74,7 +74,7 @@
struct iphdr *iph = skb->nh.iph;
struct tcphdr *th = (struct tcphdr*)(skb->nh.raw + (iph->ihl * 4));
@@ -493,10 +493,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
BUG_ON(skb->protocol != htons(ETH_P_IP));
BUG_ON(skb->nh.iph->protocol != IPPROTO_TCP);
-Index: tmp-sctp-skb-linearize/drivers/net/mv643xx_eth.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/mv643xx_eth.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/mv643xx_eth.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/mv643xx_eth.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/mv643xx_eth.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/mv643xx_eth.c 2007-01-29 11:41:35.000000000 +0000
@@ -1107,7 +1107,7 @@
#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
@@ -506,10 +506,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
stats->tx_dropped++;
printk(KERN_DEBUG "%s: failed to linearize tiny "
"unaligned fragment\n", dev->name);
-Index: tmp-sctp-skb-linearize/drivers/net/natsemi.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/natsemi.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/natsemi.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/natsemi.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/natsemi.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/natsemi.c 2007-01-29 11:41:35.000000000 +0000
@@ -323,12 +323,12 @@
The rx process only runs in the interrupt handler. Access from outside
the interrupt handler is only permitted after disable_irq().
@@ -525,10 +525,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
spin_lock_irq(&np->lock);
IV. Notes
-Index: tmp-sctp-skb-linearize/drivers/net/r8169.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/r8169.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/r8169.c 2007-01-26 17:08:57.000000000
+0000
+Index: tmp-sctp/drivers/net/r8169.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/r8169.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/r8169.c 2007-01-29 11:41:35.000000000 +0000
@@ -2175,7 +2175,7 @@
static inline u32 rtl8169_tso_csum(struct sk_buff *skb, struct net_device
*dev)
{
@@ -538,10 +538,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
if (mss)
return LargeSend | ((mss & MSSMask) << MSSShift);
-Index: tmp-sctp-skb-linearize/drivers/net/s2io.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/s2io.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/s2io.c 2007-01-26 17:08:57.000000000
+0000
+Index: tmp-sctp/drivers/net/s2io.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/s2io.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/s2io.c 2007-01-29 11:41:35.000000000 +0000
@@ -3522,8 +3522,8 @@
txdp->Control_1 = 0;
txdp->Control_2 = 0;
@@ -599,10 +599,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
val64 |= TX_FIFO_SPECIAL_FUNC;
writeq(val64, &tx_fifo->List_Control);
-Index: tmp-sctp-skb-linearize/drivers/net/sky2.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/sky2.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/sky2.c 2007-01-26 17:08:57.000000000
+0000
+Index: tmp-sctp/drivers/net/sky2.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/sky2.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/sky2.c 2007-01-29 11:41:35.000000000 +0000
@@ -1141,7 +1141,7 @@
count = sizeof(dma_addr_t) / sizeof(u32);
count += skb_shinfo(skb)->nr_frags * count;
@@ -621,10 +621,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
if (mss != 0) {
/* just drop the packet if non-linear expansion fails */
if (skb_header_cloned(skb) &&
-Index: tmp-sctp-skb-linearize/drivers/net/tg3.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/tg3.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/tg3.c 2007-01-26 17:08:57.000000000
+0000
+Index: tmp-sctp/drivers/net/tg3.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/tg3.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/tg3.c 2007-01-29 11:41:35.000000000 +0000
@@ -3664,7 +3664,7 @@
#if TG3_TSO_SUPPORT != 0
mss = 0;
@@ -634,10 +634,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
int tcp_opt_len, ip_tcp_len;
if (skb_header_cloned(skb) &&
-Index: tmp-sctp-skb-linearize/drivers/net/tulip/winbond-840.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/tulip/winbond-840.c
2007-01-20 17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/tulip/winbond-840.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/tulip/winbond-840.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/tulip/winbond-840.c 2007-01-20
17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/tulip/winbond-840.c 2007-01-29 11:41:35.000000000
+0000
@@ -1605,11 +1605,11 @@
* - get_stats:
* spin_lock_irq(np->lock), doesn't touch hw if not present
@@ -666,10 +666,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
np->stats.rx_missed_errors += ioread32(ioaddr + RxMissed) &
0xffff;
-Index: tmp-sctp-skb-linearize/drivers/net/typhoon.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/typhoon.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/typhoon.c 2007-01-26
17:08:57.000000000 +0000
+Index: tmp-sctp/drivers/net/typhoon.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/typhoon.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/typhoon.c 2007-01-29 11:41:35.000000000 +0000
@@ -340,7 +340,7 @@
#endif
@@ -679,10 +679,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
#define TSO_NUM_DESCRIPTORS 2
#define TSO_OFFLOAD_ON TYPHOON_OFFLOAD_TCP_SEGMENT
#else
-Index: tmp-sctp-skb-linearize/drivers/net/via-velocity.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/via-velocity.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/via-velocity.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/drivers/net/via-velocity.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/via-velocity.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/net/via-velocity.c 2007-01-29 11:41:35.000000000
+0000
@@ -1905,6 +1905,13 @@
int pktlen = skb->len;
@@ -714,10 +714,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
memcpy(tdinfo->buf, skb->data, skb->len);
tdinfo->skb_dma[0] = tdinfo->buf_dma;
td_ptr->tdesc0.pktsize =
-Index: tmp-sctp-skb-linearize/drivers/net/wireless/orinoco.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/net/wireless/orinoco.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/net/wireless/orinoco.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/drivers/net/wireless/orinoco.c
+===================================================================
+--- tmp-sctp.orig/drivers/net/wireless/orinoco.c 2007-01-20
17:54:03.000000000 +0000
++++ tmp-sctp/drivers/net/wireless/orinoco.c 2007-01-29 11:41:35.000000000
+0000
@@ -1835,7 +1835,9 @@
/* Set promiscuity / multicast*/
priv->promiscuous = 0;
@@ -729,10 +729,10 @@ Index: tmp-sctp-skb-linearize/drivers/ne
return 0;
}
-Index: tmp-sctp-skb-linearize/drivers/s390/net/qeth_eddp.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/s390/net/qeth_eddp.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/s390/net/qeth_eddp.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/drivers/s390/net/qeth_eddp.c
+===================================================================
+--- tmp-sctp.orig/drivers/s390/net/qeth_eddp.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/s390/net/qeth_eddp.c 2007-01-29 11:41:35.000000000
+0000
@@ -421,7 +421,7 @@
}
tcph = eddp->skb->h.th;
@@ -768,10 +768,10 @@ Index: tmp-sctp-skb-linearize/drivers/s3
}
static inline struct qeth_eddp_context *
-Index: tmp-sctp-skb-linearize/drivers/s390/net/qeth_main.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/s390/net/qeth_main.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/s390/net/qeth_main.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/drivers/s390/net/qeth_main.c
+===================================================================
+--- tmp-sctp.orig/drivers/s390/net/qeth_main.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/s390/net/qeth_main.c 2007-01-29 11:41:35.000000000
+0000
@@ -4454,7 +4454,7 @@
queue = card->qdio.out_qs
[qeth_get_priority_queue(card, skb, ipv, cast_type)];
@@ -790,10 +790,10 @@ Index: tmp-sctp-skb-linearize/drivers/s3
!(large_send == QETH_LARGE_SEND_NO)) {
card->perf_stats.large_send_bytes += skb->len;
card->perf_stats.large_send_cnt++;
-Index: tmp-sctp-skb-linearize/drivers/s390/net/qeth_tso.h
-===================================================================
---- tmp-sctp-skb-linearize.orig/drivers/s390/net/qeth_tso.h 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/drivers/s390/net/qeth_tso.h 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/drivers/s390/net/qeth_tso.h
+===================================================================
+--- tmp-sctp.orig/drivers/s390/net/qeth_tso.h 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/drivers/s390/net/qeth_tso.h 2007-01-29 11:41:35.000000000
+0000
@@ -51,7 +51,7 @@
hdr->ext.hdr_version = 1;
hdr->ext.hdr_len = 28;
@@ -803,10 +803,10 @@ Index: tmp-sctp-skb-linearize/drivers/s3
hdr->ext.dg_hdr_len = (__u16)(iph->ihl*4 + tcph->doff*4);
hdr->ext.payload_len = (__u16)(skb->len - hdr->ext.dg_hdr_len -
sizeof(struct qeth_hdr_tso));
-Index: tmp-sctp-skb-linearize/include/linux/ethtool.h
-===================================================================
---- tmp-sctp-skb-linearize.orig/include/linux/ethtool.h 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/include/linux/ethtool.h 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/include/linux/ethtool.h
+===================================================================
+--- tmp-sctp.orig/include/linux/ethtool.h 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/include/linux/ethtool.h 2007-01-29 11:41:35.000000000 +0000
@@ -408,6 +408,8 @@
#define ETHTOOL_GPERMADDR 0x00000020 /* Get permanent hardware address */
#define ETHTOOL_GUFO 0x00000021 /* Get UFO enable (ethtool_value) */
@@ -816,10 +816,10 @@ Index: tmp-sctp-skb-linearize/include/li
/* compatibility with older code */
#define SPARC_ETH_GSET ETHTOOL_GSET
-Index: tmp-sctp-skb-linearize/include/linux/netdevice.h
-===================================================================
---- tmp-sctp-skb-linearize.orig/include/linux/netdevice.h 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/include/linux/netdevice.h 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/include/linux/netdevice.h
+===================================================================
+--- tmp-sctp.orig/include/linux/netdevice.h 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/include/linux/netdevice.h 2007-01-29 11:41:35.000000000 +0000
@@ -230,7 +230,8 @@
__LINK_STATE_SCHED,
__LINK_STATE_NOCARRIER,
@@ -961,10 +961,10 @@ Index: tmp-sctp-skb-linearize/include/li
#endif /* __KERNEL__ */
#endif /* _LINUX_DEV_H */
-Index: tmp-sctp-skb-linearize/include/linux/skbuff.h
-===================================================================
---- tmp-sctp-skb-linearize.orig/include/linux/skbuff.h 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/include/linux/skbuff.h 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/include/linux/skbuff.h
+===================================================================
+--- tmp-sctp.orig/include/linux/skbuff.h 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/include/linux/skbuff.h 2007-01-29 11:41:35.000000000 +0000
@@ -134,9 +134,10 @@
struct skb_shared_info {
atomic_t dataref;
@@ -1041,10 +1041,10 @@ Index: tmp-sctp-skb-linearize/include/li
static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
int len, void *buffer)
-Index: tmp-sctp-skb-linearize/include/net/pkt_sched.h
-===================================================================
---- tmp-sctp-skb-linearize.orig/include/net/pkt_sched.h 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/include/net/pkt_sched.h 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/include/net/pkt_sched.h
+===================================================================
+--- tmp-sctp.orig/include/net/pkt_sched.h 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/include/net/pkt_sched.h 2007-01-29 11:41:35.000000000 +0000
@@ -218,12 +218,13 @@
struct rtattr *tab);
extern void qdisc_put_rtab(struct qdisc_rate_table *tab);
@@ -1062,10 +1062,10 @@ Index: tmp-sctp-skb-linearize/include/ne
}
extern int tc_classify(struct sk_buff *skb, struct tcf_proto *tp,
-Index: tmp-sctp-skb-linearize/include/net/protocol.h
-===================================================================
---- tmp-sctp-skb-linearize.orig/include/net/protocol.h 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/include/net/protocol.h 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/include/net/protocol.h
+===================================================================
+--- tmp-sctp.orig/include/net/protocol.h 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/include/net/protocol.h 2007-01-29 11:41:35.000000000 +0000
@@ -37,6 +37,8 @@
struct net_protocol {
int (*handler)(struct sk_buff *skb);
@@ -1075,10 +1075,10 @@ Index: tmp-sctp-skb-linearize/include/ne
int no_policy;
};
-Index: tmp-sctp-skb-linearize/include/net/sock.h
-===================================================================
---- tmp-sctp-skb-linearize.orig/include/net/sock.h 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/include/net/sock.h 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/include/net/sock.h
+===================================================================
+--- tmp-sctp.orig/include/net/sock.h 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/include/net/sock.h 2007-01-29 11:41:35.000000000 +0000
@@ -1064,9 +1064,13 @@
{
__sk_dst_set(sk, dst);
@@ -1093,10 +1093,10 @@ Index: tmp-sctp-skb-linearize/include/ne
}
}
-Index: tmp-sctp-skb-linearize/include/net/tcp.h
-===================================================================
---- tmp-sctp-skb-linearize.orig/include/net/tcp.h 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/include/net/tcp.h 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/include/net/tcp.h
+===================================================================
+--- tmp-sctp.orig/include/net/tcp.h 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/include/net/tcp.h 2007-01-29 11:41:35.000000000 +0000
@@ -552,13 +552,13 @@
*/
static inline int tcp_skb_pcount(const struct sk_buff *skb)
@@ -1122,10 +1122,10 @@ Index: tmp-sctp-skb-linearize/include/ne
#ifdef CONFIG_PROC_FS
extern int tcp4_proc_init(void);
extern void tcp4_proc_exit(void);
-Index: tmp-sctp-skb-linearize/net/atm/clip.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/atm/clip.c 2007-01-20 17:54:03.000000000
+0000
-+++ tmp-sctp-skb-linearize/net/atm/clip.c 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/net/atm/clip.c
+===================================================================
+--- tmp-sctp.orig/net/atm/clip.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/atm/clip.c 2007-01-29 11:41:35.000000000 +0000
@@ -101,7 +101,7 @@
printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n",clip_vcc);
return;
@@ -1144,10 +1144,10 @@ Index: tmp-sctp-skb-linearize/net/atm/cl
}
/* The neighbour entry n->lock is held. */
-Index: tmp-sctp-skb-linearize/net/bridge/br_device.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/bridge/br_device.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/bridge/br_device.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/net/bridge/br_device.c
+===================================================================
+--- tmp-sctp.orig/net/bridge/br_device.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/net/bridge/br_device.c 2007-01-29 11:41:35.000000000 +0000
@@ -146,9 +146,9 @@
struct net_bridge *br = netdev_priv(dev);
@@ -1169,10 +1169,10 @@ Index: tmp-sctp-skb-linearize/net/bridge
+ dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
+ NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_GSO_ROBUST;
}
-Index: tmp-sctp-skb-linearize/net/bridge/br_forward.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/bridge/br_forward.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/bridge/br_forward.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/net/bridge/br_forward.c
+===================================================================
+--- tmp-sctp.orig/net/bridge/br_forward.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/net/bridge/br_forward.c 2007-01-29 11:41:35.000000000 +0000
@@ -32,7 +32,7 @@
int br_dev_queue_push_xmit(struct sk_buff *skb)
{
@@ -1182,10 +1182,10 @@ Index: tmp-sctp-skb-linearize/net/bridge
kfree_skb(skb);
else {
#ifdef CONFIG_BRIDGE_NETFILTER
-Index: tmp-sctp-skb-linearize/net/bridge/br_if.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/bridge/br_if.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/bridge/br_if.c 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/net/bridge/br_if.c
+===================================================================
+--- tmp-sctp.orig/net/bridge/br_if.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/bridge/br_if.c 2007-01-29 11:41:35.000000000 +0000
@@ -385,17 +385,28 @@
struct net_bridge_port *p;
unsigned long features, checksum;
@@ -1221,10 +1221,10 @@ Index: tmp-sctp-skb-linearize/net/bridge
}
/* called with RTNL */
-Index: tmp-sctp-skb-linearize/net/bridge/br_netfilter.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/bridge/br_netfilter.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/bridge/br_netfilter.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/net/bridge/br_netfilter.c
+===================================================================
+--- tmp-sctp.orig/net/bridge/br_netfilter.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/net/bridge/br_netfilter.c 2007-01-29 11:41:35.000000000 +0000
@@ -743,7 +743,7 @@
{
if (skb->protocol == htons(ETH_P_IP) &&
@@ -1234,10 +1234,10 @@ Index: tmp-sctp-skb-linearize/net/bridge
return ip_fragment(skb, br_dev_queue_push_xmit);
else
return br_dev_queue_push_xmit(skb);
-Index: tmp-sctp-skb-linearize/net/core/dev.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/core/dev.c 2007-01-20 17:54:03.000000000
+0000
-+++ tmp-sctp-skb-linearize/net/core/dev.c 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/net/core/dev.c
+===================================================================
+--- tmp-sctp.orig/net/core/dev.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/core/dev.c 2007-01-29 11:41:35.000000000 +0000
@@ -115,6 +115,7 @@
#include <net/iw_handler.h>
#endif /* CONFIG_NET_RADIO */
@@ -1579,10 +1579,10 @@ Index: tmp-sctp-skb-linearize/net/core/d
EXPORT_SYMBOL(dev_valid_name);
EXPORT_SYMBOL(dev_add_pack);
EXPORT_SYMBOL(dev_alloc_name);
-Index: tmp-sctp-skb-linearize/net/core/dev_mcast.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/core/dev_mcast.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/core/dev_mcast.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/net/core/dev_mcast.c
+===================================================================
+--- tmp-sctp.orig/net/core/dev_mcast.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/core/dev_mcast.c 2007-01-29 11:41:35.000000000 +0000
@@ -62,7 +62,7 @@
* Device mc lists are changed by bh at least if IPv6 is enabled,
* so that it must be bh protected.
@@ -1697,10 +1697,10 @@ Index: tmp-sctp-skb-linearize/net/core/d
return 0;
}
-Index: tmp-sctp-skb-linearize/net/core/ethtool.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/core/ethtool.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/core/ethtool.c 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/net/core/ethtool.c
+===================================================================
+--- tmp-sctp.orig/net/core/ethtool.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/core/ethtool.c 2007-01-29 11:41:35.000000000 +0000
@@ -30,7 +30,7 @@
u32 ethtool_op_get_tx_csum(struct net_device *dev)
@@ -1773,10 +1773,10 @@ Index: tmp-sctp-skb-linearize/net/core/e
default:
rc = -EOPNOTSUPP;
}
-Index: tmp-sctp-skb-linearize/net/core/netpoll.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/core/netpoll.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/core/netpoll.c 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/net/core/netpoll.c
+===================================================================
+--- tmp-sctp.orig/net/core/netpoll.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/core/netpoll.c 2007-01-29 11:41:35.000000000 +0000
@@ -273,24 +273,21 @@
do {
@@ -1805,10 +1805,10 @@ Index: tmp-sctp-skb-linearize/net/core/n
/* success */
if(!status) {
-Index: tmp-sctp-skb-linearize/net/core/pktgen.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/core/pktgen.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/core/pktgen.c 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/net/core/pktgen.c
+===================================================================
+--- tmp-sctp.orig/net/core/pktgen.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/core/pktgen.c 2007-01-29 11:41:35.000000000 +0000
@@ -2592,7 +2592,7 @@
}
}
@@ -1827,10 +1827,10 @@ Index: tmp-sctp-skb-linearize/net/core/p
/* If pkt_dev->count is zero, then run forever */
if ((pkt_dev->count != 0) && (pkt_dev->sofar >= pkt_dev->count)) {
-Index: tmp-sctp-skb-linearize/net/core/skbuff.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/core/skbuff.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/core/skbuff.c 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/net/core/skbuff.c
+===================================================================
+--- tmp-sctp.orig/net/core/skbuff.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/core/skbuff.c 2007-01-29 11:41:35.000000000 +0000
@@ -164,9 +164,9 @@
shinfo = skb_shinfo(skb);
atomic_set(&shinfo->dataref, 1);
@@ -2004,10 +2004,10 @@ Index: tmp-sctp-skb-linearize/net/core/s
void __init skb_init(void)
{
skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
-Index: tmp-sctp-skb-linearize/net/decnet/dn_nsp_in.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/decnet/dn_nsp_in.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/decnet/dn_nsp_in.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/net/decnet/dn_nsp_in.c
+===================================================================
+--- tmp-sctp.orig/net/decnet/dn_nsp_in.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/net/decnet/dn_nsp_in.c 2007-01-29 11:41:35.000000000 +0000
@@ -801,8 +801,7 @@
* We linearize everything except data segments here.
*/
@@ -2018,10 +2018,10 @@ Index: tmp-sctp-skb-linearize/net/decnet
goto free_out;
}
-Index: tmp-sctp-skb-linearize/net/decnet/dn_route.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/decnet/dn_route.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/decnet/dn_route.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/net/decnet/dn_route.c
+===================================================================
+--- tmp-sctp.orig/net/decnet/dn_route.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/net/decnet/dn_route.c 2007-01-29 11:41:35.000000000 +0000
@@ -629,8 +629,7 @@
padlen);
@@ -2032,10 +2032,10 @@ Index: tmp-sctp-skb-linearize/net/decnet
goto dump_it;
switch(flags & DN_RT_CNTL_MSK) {
-Index: tmp-sctp-skb-linearize/net/ipv4/af_inet.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv4/af_inet.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/ipv4/af_inet.c 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/net/ipv4/af_inet.c
+===================================================================
+--- tmp-sctp.orig/net/ipv4/af_inet.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/ipv4/af_inet.c 2007-01-29 11:41:35.000000000 +0000
@@ -68,6 +68,7 @@
*/
@@ -2115,10 +2115,10 @@ Index: tmp-sctp-skb-linearize/net/ipv4/a
};
static int __init inet_init(void)
-Index: tmp-sctp-skb-linearize/net/ipv4/ip_output.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv4/ip_output.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/ipv4/ip_output.c 2007-01-26
17:08:58.000000000 +0000
+Index: tmp-sctp/net/ipv4/ip_output.c
+===================================================================
+--- tmp-sctp.orig/net/ipv4/ip_output.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/ipv4/ip_output.c 2007-01-29 11:41:35.000000000 +0000
@@ -210,8 +210,7 @@
return dst_output(skb);
}
@@ -2177,10 +2177,10 @@ Index: tmp-sctp-skb-linearize/net/ipv4/i
len = size;
else {
-Index: tmp-sctp-skb-linearize/net/ipv4/ipcomp.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv4/ipcomp.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/ipv4/ipcomp.c 2007-01-26 17:08:58.000000000
+0000
+Index: tmp-sctp/net/ipv4/ipcomp.c
+===================================================================
+--- tmp-sctp.orig/net/ipv4/ipcomp.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/ipv4/ipcomp.c 2007-01-29 11:41:35.000000000 +0000
@@ -84,7 +84,7 @@
struct xfrm_decap_state *decap, struct sk_buff *skb)
{
@@ -2215,10 +2215,10 @@ Index: tmp-sctp-skb-linearize/net/ipv4/i
err = ipcomp_compress(x, skb);
iph = skb->nh.iph;
-Index: tmp-sctp-skb-linearize/net/ipv4/tcp.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv4/tcp.c 2007-01-20 17:54:03.000000000
+0000
-+++ tmp-sctp-skb-linearize/net/ipv4/tcp.c 2007-01-26 17:08:59.000000000
+0000
+Index: tmp-sctp/net/ipv4/tcp.c
+===================================================================
+--- tmp-sctp.orig/net/ipv4/tcp.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/ipv4/tcp.c 2007-01-29 11:41:35.000000000 +0000
@@ -257,6 +257,7 @@
#include <linux/fs.h>
#include <linux/random.h>
@@ -2344,10 +2344,10 @@ Index: tmp-sctp-skb-linearize/net/ipv4/t
extern void __skb_cb_too_small_for_tcp(int, int);
extern struct tcp_congestion_ops tcp_reno;
-Index: tmp-sctp-skb-linearize/net/ipv4/tcp_input.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv4/tcp_input.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/ipv4/tcp_input.c 2007-01-26
17:08:59.000000000 +0000
+Index: tmp-sctp/net/ipv4/tcp_input.c
+===================================================================
+--- tmp-sctp.orig/net/ipv4/tcp_input.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/ipv4/tcp_input.c 2007-01-29 11:41:35.000000000 +0000
@@ -1072,7 +1072,7 @@
else
pkt_len = (end_seq -
@@ -2357,10 +2357,10 @@ Index: tmp-sctp-skb-linearize/net/ipv4/t
break;
pcount = tcp_skb_pcount(skb);
}
-Index: tmp-sctp-skb-linearize/net/ipv4/tcp_output.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv4/tcp_output.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/ipv4/tcp_output.c 2007-01-26
17:08:59.000000000 +0000
+Index: tmp-sctp/net/ipv4/tcp_output.c
+===================================================================
+--- tmp-sctp.orig/net/ipv4/tcp_output.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/net/ipv4/tcp_output.c 2007-01-29 11:41:35.000000000 +0000
@@ -497,15 +497,17 @@
/* Avoid the costly divide in the normal
* non-TSO case.
@@ -2476,10 +2476,10 @@ Index: tmp-sctp-skb-linearize/net/ipv4/t
/* Use a previous sequence. This should cause the other
* end to send an ack. Don't queue or clone SKB, just
-Index: tmp-sctp-skb-linearize/net/ipv4/xfrm4_output.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv4/xfrm4_output.c 2007-01-26
17:08:56.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/ipv4/xfrm4_output.c 2007-01-26
17:08:59.000000000 +0000
+Index: tmp-sctp/net/ipv4/xfrm4_output.c
+===================================================================
+--- tmp-sctp.orig/net/ipv4/xfrm4_output.c 2007-01-29 11:41:35.000000000
+0000
++++ tmp-sctp/net/ipv4/xfrm4_output.c 2007-01-29 11:41:35.000000000 +0000
@@ -9,6 +9,8 @@
*/
@@ -2565,10 +2565,10 @@ Index: tmp-sctp-skb-linearize/net/ipv4/x
int xfrm4_output(struct sk_buff *skb)
{
return NF_HOOK_COND(PF_INET, NF_IP_POST_ROUTING, skb, NULL,
skb->dst->dev,
-Index: tmp-sctp-skb-linearize/net/ipv6/ip6_output.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv6/ip6_output.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/ipv6/ip6_output.c 2007-01-26
17:08:59.000000000 +0000
+Index: tmp-sctp/net/ipv6/ip6_output.c
+===================================================================
+--- tmp-sctp.orig/net/ipv6/ip6_output.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/net/ipv6/ip6_output.c 2007-01-29 11:41:35.000000000 +0000
@@ -147,7 +147,7 @@
int ip6_output(struct sk_buff *skb)
@@ -2590,10 +2590,10 @@ Index: tmp-sctp-skb-linearize/net/ipv6/i
ipv6_select_ident(skb, &fhdr);
skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
__skb_queue_tail(&sk->sk_write_queue, skb);
-Index: tmp-sctp-skb-linearize/net/ipv6/ipcomp6.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv6/ipcomp6.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/ipv6/ipcomp6.c 2007-01-26 17:08:59.000000000
+0000
+Index: tmp-sctp/net/ipv6/ipcomp6.c
+===================================================================
+--- tmp-sctp.orig/net/ipv6/ipcomp6.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/ipv6/ipcomp6.c 2007-01-29 11:41:35.000000000 +0000
@@ -64,7 +64,7 @@
static int ipcomp6_input(struct xfrm_state *x, struct xfrm_decap_state
*decap, struct sk_buff *skb)
@@ -2628,10 +2628,10 @@ Index: tmp-sctp-skb-linearize/net/ipv6/i
/* compression */
plen = skb->len - hdr_len;
-Index: tmp-sctp-skb-linearize/net/ipv6/xfrm6_output.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/ipv6/xfrm6_output.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/ipv6/xfrm6_output.c 2007-01-26
17:08:59.000000000 +0000
+Index: tmp-sctp/net/ipv6/xfrm6_output.c
+===================================================================
+--- tmp-sctp.orig/net/ipv6/xfrm6_output.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/net/ipv6/xfrm6_output.c 2007-01-29 11:41:35.000000000 +0000
@@ -151,7 +151,7 @@
goto out_exit;
}
@@ -2692,10 +2692,10 @@ Index: tmp-sctp-skb-linearize/net/ipv6/x
int xfrm6_output(struct sk_buff *skb)
{
return NF_HOOK(PF_INET6, NF_IP6_POST_ROUTING, skb, NULL, skb->dst->dev,
-Index: tmp-sctp-skb-linearize/net/sched/sch_generic.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/sched/sch_generic.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/sched/sch_generic.c 2007-01-26
17:08:59.000000000 +0000
+Index: tmp-sctp/net/sched/sch_generic.c
+===================================================================
+--- tmp-sctp.orig/net/sched/sch_generic.c 2007-01-20 17:54:03.000000000
+0000
++++ tmp-sctp/net/sched/sch_generic.c 2007-01-29 11:41:35.000000000 +0000
@@ -71,9 +71,9 @@
dev->queue_lock serializes queue accesses for this device
AND dev->qdisc pointer itself.
@@ -2868,10 +2868,10 @@ Index: tmp-sctp-skb-linearize/net/sched/
-EXPORT_SYMBOL(qdisc_restart);
EXPORT_SYMBOL(qdisc_lock_tree);
EXPORT_SYMBOL(qdisc_unlock_tree);
-Index: tmp-sctp-skb-linearize/net/sched/sch_teql.c
-===================================================================
---- tmp-sctp-skb-linearize.orig/net/sched/sch_teql.c 2007-01-20
17:54:03.000000000 +0000
-+++ tmp-sctp-skb-linearize/net/sched/sch_teql.c 2007-01-26
17:08:59.000000000 +0000
+Index: tmp-sctp/net/sched/sch_teql.c
+===================================================================
+--- tmp-sctp.orig/net/sched/sch_teql.c 2007-01-20 17:54:03.000000000 +0000
++++ tmp-sctp/net/sched/sch_teql.c 2007-01-29 11:41:35.000000000 +0000
@@ -302,20 +302,17 @@
switch (teql_resolve(skb, skb_res, slave)) {
@@ -2896,3 +2896,16 @@ Index: tmp-sctp-skb-linearize/net/sched/
}
if (netif_queue_stopped(dev))
busy = 1;
+Index: tmp-sctp/net/sctp/input.c
+===================================================================
+--- tmp-sctp.orig/net/sctp/input.c 2007-01-29 11:41:44.000000000 +0000
++++ tmp-sctp/net/sctp/input.c 2007-01-29 11:41:51.000000000 +0000
+@@ -134,7 +134,7 @@
+
+ SCTP_INC_STATS_BH(SCTP_MIB_INSCTPPACKS);
+
+- if (skb_linearize(skb, GFP_ATOMIC))
++ if (skb_linearize(skb))
+ goto discard_it;
+
+ sh = (struct sctphdr *) skb->h.raw;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |