* YOSHIFUJI Hideaki / ?$B5HF#1QL@ <[EMAIL PROTECTED]> 2006-08-25 17:21
> commit 10204d532f5f8bb379009ba0bee2113bafda72be
> Author: YOSHIFUJI Hideaki <[EMAIL PROTECTED]>
> Date: Mon Aug 21 19:22:01 2006 +0900
>
> [IPV6] ROUTE: Routing by FWMARK.
>
> Based on patch by Jean Lorchat <[EMAIL PROTECTED]>.
>
> Signed-off-by: YOSHIFUJI Hideaki <[EMAIL PROTECTED]>
>
> diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
> index 19a82b6..2987549 100644
> --- a/include/linux/fib_rules.h
> +++ b/include/linux/fib_rules.h
> @@ -34,7 +34,7 @@ enum
> FRA_UNUSED3,
> FRA_UNUSED4,
> FRA_UNUSED5,
> - FRA_FWMARK, /* netfilter mark (IPv4) */
> + FRA_FWMARK, /* netfilter mark (IPv4/IPv6) */
> FRA_FLOW, /* flow/class id */
> FRA_UNUSED6,
> FRA_UNUSED7,
You're missing the validation policy entry for FRA_FWMARK
in the IPv6 policy.
> diff --git a/include/net/flow.h b/include/net/flow.h
> index e052291..3ca210e 100644
> --- a/include/net/flow.h
> +++ b/include/net/flow.h
> @@ -26,6 +26,7 @@ struct flowi {
> struct {
> struct in6_addr daddr;
> struct in6_addr saddr;
> + __u32 fwmark;
> __u32 flowlabel;
> } ip6_u;
Since all flowi users now use fwmark it can be moved out
of the union.
> diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
> index 91f6233..aebd9e2 100644
> --- a/net/ipv6/fib6_rules.c
> +++ b/net/ipv6/fib6_rules.c
> @@ -26,6 +26,9 @@ struct fib6_rule
> struct fib_rule common;
> struct rt6key src;
> struct rt6key dst;
> +#ifdef CONFIG_IPV6_ROUTE_FWMARK
> + u8 fwmark;
> +#endif
> u8 tclass;
> };
This doesn't look right.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html