git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b6ae90a)
That else was hiding.
authorSapan Bhatia <sapanb@cs.princeton.edu>
Mon, 21 Apr 2008 00:09:17 +0000 (00:09 +0000)
committerSapan Bhatia <sapanb@cs.princeton.edu>
Mon, 21 Apr 2008 00:09:17 +0000 (00:09 +0000)
linux-2.6-520-vnet+.patch patch | blob | history

diff --git a/linux-2.6-520-vnet+.patch b/linux-2.6-520-vnet+.patch
index b04dd90..980b48f 100644 (file)
--- a/linux-2.6-520-vnet+.patch
+++ b/linux-2.6-520-vnet+.patch
@@ -1,6 +1,6 @@
 diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/include/linux/netfilter/xt_MARK.h
 --- linux-2.6.22-510/include/linux/netfilter/xt_MARK.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-04-20 20:06:33.000000000 -0400
 @@ -11,6 +11,7 @@
        XT_MARK_SET=0,
        XT_MARK_AND,
@@ -11,7 +11,7 @@ diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/i
  struct xt_mark_target_info_v1 {
 diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h
 --- linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h       2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h       2008-04-20 20:06:33.000000000 -0400
 @@ -0,0 +1,14 @@
 +#ifndef _XT_SETXID_H_target
 +#define _XT_SETXID_H_target
@@ -29,7 +29,7 @@ diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520
 +#endif /*_XT_SETXID_H_target*/
 diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h
 --- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h   2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h   2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h   2008-04-20 20:06:33.000000000 -0400
 @@ -12,6 +12,7 @@
  #define IPT_MARK_SET  XT_MARK_SET
  #define IPT_MARK_AND  XT_MARK_AND
@@ -40,7 +40,7 @@ diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22
  
 diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h
 --- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-04-20 20:06:33.000000000 -0400
 @@ -0,0 +1,13 @@
 +#ifndef _IPT_SETXID_H_target
 +#define _IPT_SETXID_H_target
@@ -57,7 +57,7 @@ diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.
 +#endif /*_IPT_SETXID_H_target*/
 diff -Nurb linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linux/skbuff.h
 --- linux-2.6.22-510/include/linux/skbuff.h    2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/skbuff.h    2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/include/linux/skbuff.h    2008-04-20 20:06:33.000000000 -0400
 @@ -302,6 +302,7 @@
  #endif
  
@@ -68,7 +68,7 @@ diff -Nurb linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linu
        sk_buff_data_t          network_header;
 diff -Nurb linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linux/socket.h
 --- linux-2.6.22-510/include/linux/socket.h    2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/socket.h    2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/include/linux/socket.h    2008-04-20 20:06:33.000000000 -0400
 @@ -288,6 +288,8 @@
  #define SOL_TIPC      271
  #define SOL_RXRPC     272
@@ -79,8 +79,8 @@ diff -Nurb linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linu
  #define IPX_TYPE      1
  
 diff -Nurb linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/include/linux/vserver/network.h
---- linux-2.6.22-510/include/linux/vserver/network.h   2008-04-03 16:45:11.000000000 -0400
-+++ linux-2.6.22-520/include/linux/vserver/network.h   2008-04-03 16:45:14.000000000 -0400
+--- linux-2.6.22-510/include/linux/vserver/network.h   2008-04-20 20:06:30.000000000 -0400
++++ linux-2.6.22-520/include/linux/vserver/network.h   2008-04-20 20:06:33.000000000 -0400
 @@ -47,6 +47,8 @@
  #define NXC_TUN_CREATE                0x00000001
  
@@ -92,7 +92,7 @@ diff -Nurb linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/inc
  /* address types */
 diff -Nurb linux-2.6.22-510/include/net/netfilter/nf_conntrack.h linux-2.6.22-520/include/net/netfilter/nf_conntrack.h
 --- linux-2.6.22-510/include/net/netfilter/nf_conntrack.h      2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h      2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h      2008-04-20 20:06:33.000000000 -0400
 @@ -131,6 +131,9 @@
        /* Storage reserved for other modules: */
        union nf_conntrack_proto proto;
@@ -105,7 +105,7 @@ diff -Nurb linux-2.6.22-510/include/net/netfilter/nf_conntrack.h linux-2.6.22-52
  };
 diff -Nurb linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h
 --- linux-2.6.22-510/include/net/raw.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/net/raw.h 2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/include/net/raw.h 2008-04-20 20:06:33.000000000 -0400
 @@ -36,7 +36,7 @@
  
  extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
@@ -117,7 +117,7 @@ diff -Nurb linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h
  
 diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
 --- linux-2.6.22-510/net/core/skbuff.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/core/skbuff.c 2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/net/core/skbuff.c 2008-04-20 20:06:33.000000000 -0400
 @@ -56,6 +56,7 @@
  #include <linux/rtnetlink.h>
  #include <linux/init.h>
@@ -152,8 +152,8 @@ diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
        skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
        skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
 diff -Nurb linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c
---- linux-2.6.22-510/net/core/sock.c   2008-04-03 16:45:11.000000000 -0400
-+++ linux-2.6.22-520/net/core/sock.c   2008-04-03 16:45:14.000000000 -0400
+--- linux-2.6.22-510/net/core/sock.c   2008-04-20 20:06:30.000000000 -0400
++++ linux-2.6.22-520/net/core/sock.c   2008-04-20 20:06:33.000000000 -0400
 @@ -444,6 +444,19 @@
                }
                goto set_sndbuf;
@@ -184,8 +184,8 @@ diff -Nurb linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c
                        break;
                }
 diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet.c
---- linux-2.6.22-510/net/ipv4/af_inet.c        2008-04-03 16:45:11.000000000 -0400
-+++ linux-2.6.22-520/net/ipv4/af_inet.c        2008-04-03 16:45:14.000000000 -0400
+--- linux-2.6.22-510/net/ipv4/af_inet.c        2008-04-20 20:06:30.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/af_inet.c        2008-04-20 20:06:33.000000000 -0400
 @@ -178,6 +178,8 @@
                        return -EAGAIN;
                }
@@ -206,8 +206,8 @@ diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet
                goto out_rcu_unlock;
  override:
 diff -Nurb linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c
---- linux-2.6.22-510/net/ipv4/icmp.c   2008-04-03 16:45:14.000000000 -0400
-+++ linux-2.6.22-520/net/ipv4/icmp.c   2008-04-03 16:45:14.000000000 -0400
+--- linux-2.6.22-510/net/ipv4/icmp.c   2008-04-20 20:06:32.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/icmp.c   2008-04-20 20:06:33.000000000 -0400
 @@ -709,7 +709,7 @@
        if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) {
                while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr,
@@ -219,7 +219,7 @@ diff -Nurb linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c
                        iph = (struct iphdr *)skb->data;
 diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_options.c
 --- linux-2.6.22-510/net/ipv4/ip_options.c     2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/ipv4/ip_options.c     2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/ip_options.c     2008-04-20 20:06:33.000000000 -0400
 @@ -409,7 +409,7 @@
                                        optptr[2] += 8;
                                        break;
@@ -248,8 +248,8 @@ diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_o
                                goto error;
                        }
 diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c
---- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c      2008-04-03 16:45:06.000000000 -0400
-+++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c      2008-04-03 16:45:14.000000000 -0400
+--- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c      2008-04-20 20:06:25.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c      2008-04-20 20:06:33.000000000 -0400
 @@ -49,6 +49,8 @@
        else
                logflags = NF_LOG_MASK;
@@ -260,8 +260,8 @@ diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ip
        if (ih == NULL) {
                printk("TRUNCATED");
 diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
---- linux-2.6.22-510/net/ipv4/raw.c    2008-04-03 16:45:11.000000000 -0400
-+++ linux-2.6.22-520/net/ipv4/raw.c    2008-04-03 16:45:14.000000000 -0400
+--- linux-2.6.22-510/net/ipv4/raw.c    2008-04-20 20:06:30.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/raw.c    2008-04-20 20:06:33.000000000 -0400
 @@ -103,7 +103,7 @@
  
  struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
@@ -308,7 +308,7 @@ diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
                goto error_free;
 diff -Nurb linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter/Kconfig
 --- linux-2.6.22-510/net/netfilter/Kconfig     2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/Kconfig     2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/net/netfilter/Kconfig     2008-04-20 20:06:33.000000000 -0400
 @@ -389,6 +389,13 @@
  
          To compile it as a module, choose M here.  If unsure, say N.
@@ -325,7 +325,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter
        depends on NETFILTER_XTABLES
 diff -Nurb linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilter/Makefile
 --- linux-2.6.22-510/net/netfilter/Makefile    2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/Makefile    2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/net/netfilter/Makefile    2008-04-20 20:06:33.000000000 -0400
 @@ -37,6 +37,7 @@
  obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
  
@@ -336,7 +336,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilte
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
 diff -Nurb linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/net/netfilter/nf_conntrack_core.c
 --- linux-2.6.22-510/net/netfilter/nf_conntrack_core.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-04-20 20:06:33.000000000 -0400
 @@ -726,6 +726,8 @@
  
        /* Overload tuple linked list to put us in unconfirmed list. */
@@ -348,7 +348,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/n
  
 diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilter/xt_MARK.c
 --- linux-2.6.22-510/net/netfilter/xt_MARK.c   2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/xt_MARK.c   2008-04-04 17:27:41.000000000 -0400
++++ linux-2.6.22-520/net/netfilter/xt_MARK.c   2008-04-20 20:09:08.000000000 -0400
 @@ -5,13 +5,18 @@
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License version 2 as
@@ -426,7 +426,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt
  
        switch (markinfo->mode) {
        case XT_MARK_SET:
-@@ -58,8 +105,64 @@
+@@ -58,8 +105,63 @@
        case XT_MARK_OR:
                mark = (*pskb)->mark | markinfo->mark;
                break;
@@ -479,8 +479,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt
 +                                                            ct->xid[!dir]=connection_sk->sk_xid;
 +                                                            if (connection_sk->sk_xid != 0) 
 +                                                                    mark = connection_sk->sk_xid;
-+                                                                                                                    else
-+                                                                    sock_put(connection_sk);
++                                                            sock_put(connection_sk);
 +                                                    }
 +                                            }
 +                                            break;
@@ -491,7 +490,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt
        (*pskb)->mark = mark;
        return XT_CONTINUE;
  }
-@@ -92,7 +195,8 @@
+@@ -92,7 +194,8 @@
  
        if (markinfo->mode != XT_MARK_SET
            && markinfo->mode != XT_MARK_AND
@@ -503,7 +502,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt
                return 0;
 diff -Nurb linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c
 --- linux-2.6.22-510/net/netfilter/xt_SETXID.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-04-20 20:06:33.000000000 -0400
 @@ -0,0 +1,79 @@
 +#include <linux/module.h>
 +#include <linux/skbuff.h>
@@ -586,7 +585,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfi
 +module_exit(fini);
 diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c
 --- linux-2.6.22-510/net/packet/af_packet.c    2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/packet/af_packet.c    2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/net/packet/af_packet.c    2008-04-20 20:06:33.000000000 -0400
 @@ -78,6 +78,7 @@
  #include <linux/poll.h>
  #include <linux/module.h>
@@ -637,7 +636,7 @@ diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/a
            sock->type != SOCK_PACKET)
 diff -Nurb linux-2.6.22-510/xt_MARK.c linux-2.6.22-520/xt_MARK.c
 --- linux-2.6.22-510/xt_MARK.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/xt_MARK.c 2008-04-04 14:26:30.000000000 -0400
++++ linux-2.6.22-520/xt_MARK.c 2008-04-20 20:06:33.000000000 -0400
 @@ -0,0 +1,287 @@
 +/* This is a module which is used for setting the NFMARK field of an skb. */
 +
linux-2.6