Author: baggins Date: Mon Jul 11 21:36:30 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- compiles now
---- Files affected:
packages/kernel:
kernel-vserver-2.3.patch (1.67 -> 1.68)
---- Diffs:
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.67
packages/kernel/kernel-vserver-2.3.patch:1.68
--- packages/kernel/kernel-vserver-2.3.patch:1.67 Mon Jul 11 23:09:03 2011
+++ packages/kernel/kernel-vserver-2.3.patch Mon Jul 11 23:36:25 2011
@@ -26002,13 +26002,13 @@
+++ linux-3.0-rc5-vs2.3.1-pre3/net/netfilter/ipvs/ip_vs_xmit.c
@@ -213,7 +213,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
- if (ipv6_addr_any(&fl.fl6_src) &&
+ if (ipv6_addr_any(&fl6.saddr) &&
ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
-- &fl.fl6_dst, 0, &fl.fl6_src) < 0)
-+ &fl.fl6_dst, 0, &fl.fl6_src, NULL) < 0)
- goto out_err;
- if (do_xfrm && xfrm_lookup(net, &dst, &fl, NULL, 0) < 0)
+- &fl6.daddr, 0, &fl6.saddr) < 0)
++ &fl6.daddr, 0, &fl6.saddr, NULL) < 0)
goto out_err;
+ if (do_xfrm) {
+ dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
diff -NurpP --minimal linux-3.0-rc5/net/netlink/af_netlink.c
linux-3.0-rc5-vs2.3.1-pre3/net/netlink/af_netlink.c
--- linux-3.0-rc5/net/netlink/af_netlink.c 2011-07-01 11:14:27.000000000
+0200
+++ linux-3.0-rc5-vs2.3.1-pre3/net/netlink/af_netlink.c 2011-06-10
22:11:24.000000000 +0200
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.67&r2=1.68&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
