packages: kernel/kernel-pom-ng-ROUTE.patch, kernel/kernel-routes.patch - up...

[arekm]

Author: arekm                        Date: Thu Sep 10 20:31:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated

---- Files affected:
packages/kernel:
   kernel-pom-ng-ROUTE.patch (1.2 -> 1.3) , kernel-routes.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-pom-ng-ROUTE.patch
diff -u packages/kernel/kernel-pom-ng-ROUTE.patch:1.2 packages/kernel/kernel-pom-ng-ROUTE.patch:1.3
--- packages/kernel/kernel-pom-ng-ROUTE.patch:1.2	Tue Mar 31 14:04:30 2009
+++ packages/kernel/kernel-pom-ng-ROUTE.patch	Thu Sep 10 22:31:37 2009
@@ -177,8 +177,8 @@
 +	}
 +	
 +	/* Drop old route. */
-+	dst_release(skb->dst);
-+	skb->dst = NULL;
++	skb_dst_drop(skb);
++
 +
 +	/* Success if no oif specified or if the oif correspond to the 
 +	 * one desired */
@@ -334,8 +334,8 @@
 +	}
 +
 +	skb->dev = dev_in;
-+	dst_release(skb->dst);
-+	skb->dst = NULL;
++	skb_dst_drop(skb);
++
 +
 +	netif_rx(skb);
 +	dev_put(dev_in);
@@ -410,8 +410,8 @@
 +
 +			if (skb->dev == rt->u.dst.dev) {
 +				/* Drop old route. */
-+				dst_release(skb->dst);
-+				skb->dst = &rt->u.dst;
++				skb_dst_drop(skb);
++				skb_dst_set(skb, &rt->u.dst);
 +
 +				/* this will traverse normal stack, and 
 +				 * thus call conntrack on the icmp packet */
@@ -668,8 +668,8 @@
 +	}
 +
 +	/* Drop old route. */
-+	dst_release(skb->dst);
-+	skb->dst = &rt->u.dst;
++	skb_dst_drop(skb);
++	skb_dst_set(skb, &rt->u.dst);
 +	skb->dev = rt->rt6i_dev;
 +	return 1;
 +

================================================================
Index: packages/kernel/kernel-routes.patch
diff -u packages/kernel/kernel-routes.patch:1.6 packages/kernel/kernel-routes.patch:1.7
--- packages/kernel/kernel-routes.patch:1.6	Thu Sep 10 22:24:59 2009
+++ packages/kernel/kernel-routes.patch	Thu Sep 10 22:31:37 2009
@@ -959,7 +959,7 @@
 +			{ .daddr = ip_hdr(skb)->daddr,
 +				.tos = (RT_TOS(ip_hdr(skb)->tos) |
 +						RTO_CONN),
-+				.gw = skb->rtable->rt_gateway,
++				.gw = skb_rtable(skb)->rt_gateway,
 +			} },
 +					 .mark = skb->mark,
 +					 .oif = par->out->ifindex };
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-pom-ng-ROUTE.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-routes.patch?r1=1.6&r2=1.7&f=u