Author: zbyniu Date: Tue Oct 9 13:16:22 2007 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.23-rc9
---- Files affected:
SOURCES:
kernel-owner-xid.patch (1.1.2.1 -> 1.1.2.2) , kernel-routes-2.6.22-15.diff
(1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/kernel-owner-xid.patch
diff -u SOURCES/kernel-owner-xid.patch:1.1.2.1
SOURCES/kernel-owner-xid.patch:1.1.2.2
--- SOURCES/kernel-owner-xid.patch:1.1.2.1 Sun Sep 9 22:35:44 2007
+++ SOURCES/kernel-owner-xid.patch Tue Oct 9 15:16:17 2007
@@ -59,7 +59,7 @@
--- linux-2.6.17.11-vs2.1.1-rc31/net/ipv4/netfilter/ipt_owner.c
2006-06-18 15:25:05.000000000 +0200
+++ linux-2.6.17.11-vs2.1.1-rc31.owner-xid/net/ipv4/netfilter/ipt_owner.c
2006-09-05 19:44:43.000000000 +0200
@@ -48,6 +48,18 @@ match(const struct sk_buff *skb,
- return 0;
+ return false;
}
+ if(info->match & IPT_OWNER_NID) {
@@ -74,14 +74,14 @@
+ return 0;
+ }
+
- return 1;
+ return true;
}
diff -Nurp linux-2.6.17.11-vs2.1.1-rc31/net/ipv6/netfilter/ip6t_owner.c
linux-2.6.17.11-vs2.1.1-rc31.owner-xid/net/ipv6/netfilter/ip6t_owner.c
--- linux-2.6.17.11-vs2.1.1-rc31/net/ipv6/netfilter/ip6t_owner.c
2006-06-18 15:25:05.000000000 +0200
+++ linux-2.6.17.11-vs2.1.1-rc31.owner-xid/net/ipv6/netfilter/ip6t_owner.c
2006-09-05 19:46:57.000000000 +0200
@@ -49,6 +49,18 @@ match(const struct sk_buff *skb,
- return 0;
+ return false;
}
+ if (info->match & IP6T_OWNER_NID) {
@@ -96,6 +96,6 @@
+ return 0;
+ }
+
- return 1;
+ return true;
}
================================================================
Index: SOURCES/kernel-routes-2.6.22-15.diff
diff -u SOURCES/kernel-routes-2.6.22-15.diff:1.1.2.1
SOURCES/kernel-routes-2.6.22-15.diff:1.1.2.2
--- SOURCES/kernel-routes-2.6.22-15.diff:1.1.2.1 Tue Aug 7 17:21:49 2007
+++ SOURCES/kernel-routes-2.6.22-15.diff Tue Oct 9 15:16:17 2007
@@ -1000,21 +1000,22 @@
rth->rt_spec_dst= spec_dst;
rth->u.dst.input = ip_forward;
-@@ -1816,19 +1822,20 @@ static inline int ip_mkroute_input_def(s
- struct fib_result* res,
- const struct flowi *fl,
- struct in_device *in_dev,
-- __be32 daddr, __be32 saddr, u32 tos)
-+ __be32 daddr, __be32 saddr, u32 tos,
__be32 lsrc)
+@@ -1806,7 +1806,7 @@ static inline int ip_mkroute_input(struc
+ struct fib_result* res,
+ const struct flowi *fl,
+ struct in_device *in_dev,
+- __be32 daddr, __be32 saddr, u32 tos)
++ __be32 daddr, __be32 saddr, u32 tos, __be32
lsrc)
{
struct rtable* rth = NULL;
int err;
+@@ -1816,13 +1822,14 @@ static inline int ip_mkroute_input_def(s
+ int err;
unsigned hash;
+ fib_select_default(fl, res);
#ifdef CONFIG_IP_ROUTE_MULTIPATH
-- if (res->fi && res->fi->fib_nhs > 1 && fl->oif == 0)
-+ if (res->fi && res->fi->fib_nhs > 1)
+ if (res->fi && res->fi->fib_nhs > 1 && fl->oif == 0)
fib_select_multipath(fl, res);
#endif
@@ -1023,42 +1024,6 @@
+ err = __mkroute_input(skb, res, in_dev, daddr, saddr, tos, lsrc, &rth);
if (err)
return err;
-
-@@ -1841,7 +1848,7 @@ static inline int ip_mkroute_input(struc
- struct fib_result* res,
- const struct flowi *fl,
- struct in_device *in_dev,
-- __be32 daddr, __be32 saddr, u32 tos)
-+ __be32 daddr, __be32 saddr, u32 tos, __be32
lsrc)
- {
- #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
- struct rtable* rth = NULL, *rtres;
-@@ -1857,7 +1864,7 @@ static inline int ip_mkroute_input(struc
- /* distinguish between multipath and singlepath */
- if (hopcount < 2)
- return ip_mkroute_input_def(skb, res, fl, in_dev, daddr,
-- saddr, tos);
-+ saddr, tos, 0);
-
- /* add all alternatives to the routing cache */
- for (hop = 0; hop < hopcount; hop++) {
-@@ -1869,7 +1876,7 @@ static inline int ip_mkroute_input(struc
-
- /* create a routing cache entry */
- err = __mkroute_input(skb, res, in_dev, daddr, saddr, tos,
-- &rth);
-+ 0, &rth);
- if (err)
- return err;
-
-@@ -1889,7 +1896,7 @@ static inline int ip_mkroute_input(struc
- skb->dst = &rtres->u.dst;
- return err;
- #else /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */
-- return ip_mkroute_input_def(skb, res, fl, in_dev, daddr, saddr, tos);
-+ return ip_mkroute_input_def(skb, res, fl, in_dev, daddr, saddr, tos,
lsrc);
- #endif /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */
- }
@@ -1905,18 +1912,18 @@ static inline int ip_mkroute_input(struc
*/
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-owner-xid.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-routes-2.6.22-15.diff?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
