From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Tue, 13 Nov 2007 21:13:52 +0000 (+0000)
Subject: Add changes from the Linux-2.6 tree.
X-Git-Tag: linux-2.6-22-1~24
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=698adff3c3949c437fe8be4f27db090b1ae0c503;p=linux-2.6.git

Add changes from the Linux-2.6 tree.
---

diff --git a/configs/kread b/configs/kread
index 9278afe34..9851315c1 100755
--- a/configs/kread
+++ b/configs/kread
@@ -5,7 +5,7 @@
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: kread.py,v 1.3 2006/12/01 02:43:01 mef Exp $
+# $Id: kread,v 1.1 2006/12/01 16:21:13 mef Exp $
 #
 
 import sys, re, os, stat
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index 33581c13d..20f90bc44 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -104,6 +104,9 @@ struct ip_conntrack
 	/* Storage reserved for other modules: */
 	union ip_conntrack_proto proto;
 
+	/* PLANETLAB. VNET-specific */
+	xid_t xid[IP_CT_DIR_MAX];
+
 	union ip_conntrack_help help;
 
 #ifdef CONFIG_IP_NF_NAT_NEEDED
diff --git a/mm/oom_panic.c b/mm/oom_panic.c
index b782934ac..4230ae503 100644
--- a/mm/oom_panic.c
+++ b/mm/oom_panic.c
@@ -9,7 +9,7 @@
  *
  * Mark Huang <mlhuang@cs.princeton.edu>
  *
- * $Id$
+ * $Id: oom_panic.c,v 1.1 2004/10/01 17:54:48 mlhuang Exp $
  */
 
 #include <linux/mm.h>
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index f8b3009ba..2f2232ec7 100644
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -720,6 +720,8 @@ init_conntrack(struct ip_conntrack_tuple *tuple,
 
 	/* Overload tuple linked list to put us in unconfirmed list. */
 	list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);
+	conntrack->xid[IP_CT_DIR_ORIGINAL] = -1;
+	conntrack->xid[IP_CT_DIR_REPLY] = -1;
 
 	write_unlock_bh(&ip_conntrack_lock);
 
diff --git a/net/netfilter/xt_MARK.c b/net/netfilter/xt_MARK.c
index 133eb2f07..859b6afef 100644
--- a/net/netfilter/xt_MARK.c
+++ b/net/netfilter/xt_MARK.c
@@ -138,13 +138,13 @@ target_v1(struct sk_buff **pskb,
 		}
 
 		if (connection_sk) {
-			/* XXX:
+#ifdef REQUIRESFIXFROMSAPAN
 			connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
 			ct->xid[!dir]=connection_sk->sk_xid;
-			*/
-			connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_sk->sk_xid;
+			/*connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_sk->sk_xid;*/
 			if (connection_sk->sk_xid != 0) 
 				mark = connection_sk->sk_xid;
+#endif
 			if (connection_sk != (*pskb)->sk)
 				sock_put(connection_sk);
 		}