Re: [GIT PATCH] IPv6 Updates for net-2.6.19

[Brian Haley <brian.haley@hp.com>]

[-- Attachment #1: Type: text/plain, Size: 622 bytes --]

> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index c9f74c1..9b50e0c 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -703,6 +703,7 @@ void ip6_route_input(struct sk_buff *skb
>  			.ip6_u = {
>  				.daddr = iph->daddr,
>  				.saddr = iph->saddr,
> +				.fwmark = skb->nfmark,
>  				.flowlabel = (* (u32 *) iph)&IPV6_FLOWINFO_MASK,
>  			},
>  		},

I can't build the latest 2.6.19-git with this patch, skb->nfmark 
requires CONFIG_NETFILTER, which isn't in my .config.  The obvious 
workaround is the patch below, but that might not be what you want.  Can 
send my .config if you need it.

-Brian


[-- Attachment #2: nfmark.patch --]
[-- Type: text/x-patch, Size: 381 bytes --]

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 9b50e0c..dc880cc 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -703,7 +703,9 @@ void ip6_route_input(struct sk_buff *skb
 			.ip6_u = {
 				.daddr = iph->daddr,
 				.saddr = iph->saddr,
+#ifdef CONFIG_NETFILTER
 				.fwmark = skb->nfmark,
+#endif
 				.flowlabel = (* (u32 *) iph)&IPV6_FLOWINFO_MASK,
 			},
 		},