Re: DECNET in latest BK

[Francois Romieu]

David S. Miller <[e-mail]> :
[...]
> Turn off CONFIG_DECNET_ROUTE_FWMARK, aparently even the maintainer
> doesn't even enable this option :-)

Does the attached patch make sense ?

 net/decnet/dn_route.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN net/decnet/dn_route.c~decnet-compile-fix net/decnet/dn_route.c
--- linux-2.5.68-1.1118.1.6-to-1.1192/net/decnet/dn_route.c~decnet-compile-fix	Fri May  2 23:19:48 2003
+++ linux-2.5.68-1.1118.1.6-to-1.1192-fr/net/decnet/dn_route.c	Fri May  2 23:19:48 2003
@@ -1055,7 +1055,7 @@ make_route:
 	rt->fl.oif        = oldflp->oif;
 	rt->fl.iif        = 0;
 #ifdef CONFIG_DECNET_ROUTE_FWMARK
-	rt->fl.fld_fwmark = flp->fld_fwmark;
+	rt->fl.fld_fwmark = oldflp->fld_fwmark;
 #endif
 
 	rt->rt_saddr      = fl.fld_src;
@@ -1180,7 +1180,7 @@ static int dn_route_input_slow(struct sk
 				       .saddr = cb->src,
 				       .scope = RT_SCOPE_UNIVERSE,
 #ifdef CONFIG_DECNET_ROUTE_FWMARK
-				       .fwmark = skb->fwmark
+				       .fwmark = skb->nfmark
 #endif
 				    } },
 			    .iif = skb->dev->ifindex };