packages: kernel/kernel-routes.patch - RTO_CONN constant has been removed (...

[baggins]

Author: baggins                      Date: Mon Jul 11 20:33:28 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- RTO_CONN constant has been removed (it was just an alias for 0)

---- Files affected:
packages/kernel:
   kernel-routes.patch (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-routes.patch
diff -u packages/kernel/kernel-routes.patch:1.15 packages/kernel/kernel-routes.patch:1.16
--- packages/kernel/kernel-routes.patch:1.15	Mon Jul 11 11:30:01 2011
+++ packages/kernel/kernel-routes.patch	Mon Jul 11 22:33:23 2011
@@ -779,7 +779,7 @@
  	__be32 newsrc;
  
  	NF_CT_ASSERT(par->hooknum == NF_INET_POST_ROUTING);
-@@ -69,13 +69,28 @@ masquerade_tg(struct sk_buff *skb, const
+@@ -69,13 +69,27 @@ masquerade_tg(struct sk_buff *skb, const
  		return NF_ACCEPT;
  
  	mr = par->targinfo;
@@ -790,8 +790,7 @@
 -		return NF_DROP;
 +
 +	{
-+		struct flowi4 fl4 = { .flowi4_tos = (RT_TOS(ip_hdr(skb)->tos) |
-+						     RTO_CONN),
++		struct flowi4 fl4 = { .flowi4_tos = (RT_TOS(ip_hdr(skb)->tos)),
 +				      .flowi4_mark = skb->mark,
 +				      .flowi4_oif = par->out->ifindex,
 +				      .daddr = ip_hdr(skb)->daddr,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-routes.patch?r1=1.15&r2=1.16&f=u