DECNET in latest BK

DECNET in latest BK

[Larry McVoy]

Doesn't build, I didn't config it out by mistake.  Dunno if anyone uses
decnet.

net/decnet/dn_route.c: In function `dn_route_output_slow':
net/decnet/dn_route.c:1058: `flp' undeclared (first use in this function)
net/decnet/dn_route.c:1058: (Each undeclared identifier is reported only once
net/decnet/dn_route.c:1058: for each function it appears in.)
net/decnet/dn_route.c: In function `dn_route_input_slow':
net/decnet/dn_route.c:1183: structure has no member named `fwmark'
make[2]: *** [net/decnet/dn_route.o] Error 1
make[1]: *** [net/decnet] Error 2
make: *** [net] Error 2

-- 
---
Larry McVoy              lm at bitmover.com          http://www.bitmover.com/lm

Re: DECNET in latest BK

[David S. Miller]

On Sat, 2003-05-03 at 10:59, Larry McVoy wrote:
> Doesn't build, I didn't config it out by mistake.  Dunno if anyone uses
> decnet.
> 
> net/decnet/dn_route.c: In function `dn_route_output_slow':
> net/decnet/dn_route.c:1058: `flp' undeclared (first use in this function)

Turn off CONFIG_DECNET_ROUTE_FWMARK, aparently even the maintainer
doesn't even enable this option :-)

-- 
David S. Miller <davem@redhat.com>
D

Re: DECNET in latest BK

[Francois Romieu]

David S. Miller <davem@redhat.com> :
[...]
> 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 };

Re: DECNET in latest BK

[David S. Miller]

   From: Francois Romieu <romieu@fr.zoreil.com>
   Date: Sat, 3 May 2003 20:39:08 +0200

   David S. Miller <davem@redhat.com> :
   [...]
   > Turn off CONFIG_DECNET_ROUTE_FWMARK, aparently even the maintainer
   > doesn't even enable this option :-)
   
   Does the attached patch make sense ?

Looks good, applied.

Thanks.

Re: DECNET in latest BK

[Steven Whitehouse]

Hi,

> 
> David S. Miller <davem@redhat.com> :
> [...]
> > Turn off CONFIG_DECNET_ROUTE_FWMARK, aparently even the maintainer
> > doesn't even enable this option :-)
> 
> Does the attached patch make sense ?
>
Yes, I can confirm thats the right fix. I was a bit busy last week and my fix
didn't make it in time, but I'm back now and so the rest of my pending DECnet
patches will be submitted shortly. Thanks for the patch,

Steve.