revert back to .14

[linux-2.6.git] / linux-2.6-521-packet-tagging.patch

diff --git a/linux-2.6-521-packet-tagging.patch b/linux-2.6-521-packet-tagging.patch
index a59ef8b..5ad9a15 100644 (file)
--- a/linux-2.6-521-packet-tagging.patch
+++ b/linux-2.6-521-packet-tagging.patch
@@ -1,8 +1,7 @@
-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 {
+diff -Nurb linux-2.6.27-510/include/linux/skbuff.h linux-2.6.27-521/include/linux/skbuff.h
+--- linux-2.6.27-510/include/linux/skbuff.h    2008-10-09 18:13:53.000000000 -0400
++++ linux-2.6.27-521/include/linux/skbuff.h    2009-07-23 10:51:52.000000000 -0400
+@@ -330,6 +330,7 @@
  #endif
  
        __u32                   mark;
@@ -10,10 +9,9 @@ Index: linux-2.6.27.y/include/linux/skbuff.h
  
        __u16                   vlan_tci;
  
-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
+diff -Nurb linux-2.6.27-510/net/core/skbuff.c linux-2.6.27-521/net/core/skbuff.c
+--- linux-2.6.27-510/net/core/skbuff.c 2008-10-09 18:13:53.000000000 -0400
++++ linux-2.6.27-521/net/core/skbuff.c 2009-07-23 10:51:52.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <linux/rtnetlink.h>
  #include <linux/init.h>
@@ -22,7 +20,7 @@ Index: linux-2.6.27.y/net/core/skbuff.c
  
  #include <net/protocol.h>
  #include <net/dst.h>
-@@ -197,6 +198,7 @@ struct sk_buff *__alloc_skb(unsigned int
+@@ -209,6 +210,7 @@
        skb->data = data;
        skb_reset_tail_pointer(skb);
        skb->end = skb->tail + size;
@@ -30,7 +28,7 @@ Index: linux-2.6.27.y/net/core/skbuff.c
        /* make sure we initialize shinfo sequentially */
        shinfo = skb_shinfo(skb);
        atomic_set(&shinfo->dataref, 1);
-@@ -448,6 +450,7 @@ static void __copy_skb_header(struct sk_
+@@ -460,6 +462,7 @@
  #endif
  #endif
        new->vlan_tci           = old->vlan_tci;
@@ -38,7 +36,7 @@ Index: linux-2.6.27.y/net/core/skbuff.c
  
        skb_copy_secmark(new, old);
  }
-@@ -478,6 +481,8 @@ static struct sk_buff *__skb_clone(struc
+@@ -490,6 +493,8 @@
  #endif
        atomic_set(&n->users, 1);
  
@@ -47,11 +45,10 @@ Index: linux-2.6.27.y/net/core/skbuff.c
        atomic_inc(&(skb_shinfo(skb)->dataref));
        skb->cloned = 1;
  
-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
+diff -Nurb linux-2.6.27-510/net/core/sock.c linux-2.6.27-521/net/core/sock.c
+--- linux-2.6.27-510/net/core/sock.c   2009-07-23 10:51:44.000000000 -0400
++++ linux-2.6.27-521/net/core/sock.c   2009-11-25 17:36:26.000000000 -0500
+@@ -954,6 +954,8 @@
                sk->sk_prot = sk->sk_prot_creator = prot;
                sock_lock_init(sk);
                sock_net_set(sk, get_net(net));
@@ -60,11 +57,10 @@ Index: linux-2.6.27.y/net/core/sock.c
        }
  
        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
+diff -Nurb linux-2.6.27-510/net/ipv4/af_inet.c linux-2.6.27-521/net/ipv4/af_inet.c
+--- linux-2.6.27-510/net/ipv4/af_inet.c        2009-07-23 10:51:44.000000000 -0400
++++ linux-2.6.27-521/net/ipv4/af_inet.c        2009-07-23 10:51:52.000000000 -0400
+@@ -181,6 +181,8 @@
                        return -EAGAIN;
                }
                inet->sport = htons(inet->num);
@@ -73,11 +69,10 @@ Index: linux-2.6.27.y/net/ipv4/af_inet.c
        }
        release_sock(sk);
        return 0;
-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_
+diff -Nurb linux-2.6.27-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.27-521/net/ipv4/netfilter/ipt_LOG.c
+--- linux-2.6.27-510/net/ipv4/netfilter/ipt_LOG.c      2008-10-09 18:13:53.000000000 -0400
++++ linux-2.6.27-521/net/ipv4/netfilter/ipt_LOG.c      2009-07-23 10:51:52.000000000 -0400
+@@ -45,6 +45,8 @@
        else
                logflags = NF_LOG_MASK;