-diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-P/include/linux/skbuff.h linux-2.6.27.10-vs2.3.x-P521/include/linux/skbuff.h
---- linux-2.6.27.10-vs2.3.x-P/include/linux/skbuff.h 2008-10-13 14:52:09.000000000 +0200
-+++ linux-2.6.27.10-vs2.3.x-P521/include/linux/skbuff.h 2009-01-12 01:18:23.000000000 +0100
+Index: linux-2.6.27.y/include/linux/skbuff.h
+===================================================================
+--- linux-2.6.27.y.orig/include/linux/skbuff.h
++++ linux-2.6.27.y/include/linux/skbuff.h
@@ -330,6 +330,7 @@ struct sk_buff {
#endif
__u16 vlan_tci;
-diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-P/net/core/skbuff.c linux-2.6.27.10-vs2.3.x-P521/net/core/skbuff.c
---- linux-2.6.27.10-vs2.3.x-P/net/core/skbuff.c 2008-10-13 14:52:09.000000000 +0200
-+++ linux-2.6.27.10-vs2.3.x-P521/net/core/skbuff.c 2009-01-12 01:56:55.000000000 +0100
+Index: linux-2.6.27.y/net/core/skbuff.c
+===================================================================
+--- linux-2.6.27.y.orig/net/core/skbuff.c
++++ linux-2.6.27.y/net/core/skbuff.c
@@ -55,6 +55,7 @@
#include <linux/rtnetlink.h>
#include <linux/init.h>
#include <net/protocol.h>
#include <net/dst.h>
-@@ -209,6 +210,7 @@ struct sk_buff *__alloc_skb(unsigned int
+@@ -197,6 +198,7 @@ struct sk_buff *__alloc_skb(unsigned int
skb->data = data;
skb_reset_tail_pointer(skb);
skb->end = skb->tail + size;
/* make sure we initialize shinfo sequentially */
shinfo = skb_shinfo(skb);
atomic_set(&shinfo->dataref, 1);
-@@ -460,6 +462,7 @@ static void __copy_skb_header(struct sk_
+@@ -448,6 +450,7 @@ static void __copy_skb_header(struct sk_
#endif
#endif
new->vlan_tci = old->vlan_tci;
skb_copy_secmark(new, old);
}
-@@ -490,6 +493,8 @@ static struct sk_buff *__skb_clone(struc
+@@ -478,6 +481,8 @@ static struct sk_buff *__skb_clone(struc
#endif
atomic_set(&n->users, 1);
atomic_inc(&(skb_shinfo(skb)->dataref));
skb->cloned = 1;
-diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-P/net/ipv4/af_inet.c linux-2.6.27.10-vs2.3.x-P521/net/ipv4/af_inet.c
---- linux-2.6.27.10-vs2.3.x-P/net/ipv4/af_inet.c 2008-10-13 14:54:20.000000000 +0200
-+++ linux-2.6.27.10-vs2.3.x-P521/net/ipv4/af_inet.c 2009-01-12 01:18:23.000000000 +0100
+Index: linux-2.6.27.y/net/core/sock.c
+===================================================================
+--- linux-2.6.27.y.orig/net/core/sock.c
++++ linux-2.6.27.y/net/core/sock.c
+@@ -956,6 +956,8 @@ struct sock *sk_alloc(struct net *net, i
+ sk->sk_prot = sk->sk_prot_creator = prot;
+ sock_lock_init(sk);
+ sock_net_set(sk, get_net(net));
++ if (!in_interrupt())
++ sk->sk_mark = nx_current_nid();
+ }
+
+ return sk;
+Index: linux-2.6.27.y/net/ipv4/af_inet.c
+===================================================================
+--- linux-2.6.27.y.orig/net/ipv4/af_inet.c
++++ linux-2.6.27.y/net/ipv4/af_inet.c
@@ -181,6 +181,8 @@ static int inet_autobind(struct sock *sk
return -EAGAIN;
}
}
release_sock(sk);
return 0;
-diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-P/net/ipv4/netfilter/ipt_LOG.c linux-2.6.27.10-vs2.3.x-P521/net/ipv4/netfilter/ipt_LOG.c
---- linux-2.6.27.10-vs2.3.x-P/net/ipv4/netfilter/ipt_LOG.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.10-vs2.3.x-P521/net/ipv4/netfilter/ipt_LOG.c 2009-01-12 01:18:23.000000000 +0100
+Index: linux-2.6.27.y/net/ipv4/netfilter/ipt_LOG.c
+===================================================================
+--- linux-2.6.27.y.orig/net/ipv4/netfilter/ipt_LOG.c
++++ linux-2.6.27.y/net/ipv4/netfilter/ipt_LOG.c
@@ -45,6 +45,8 @@ static void dump_packet(const struct nf_
else
logflags = NF_LOG_MASK;