patch-2.3.99-pre2 linux/net/decnet/dn_route.c

• Lines: 23
• Date: Fri Mar 17 10:56:20 2000
• Orig file: v2.3.99-pre1/linux/net/decnet/dn_route.c
• Orig date: Fri Mar 10 16:40:51 2000

diff -u --recursive --new-file v2.3.99-pre1/linux/net/decnet/dn_route.c linux/net/decnet/dn_route.c
@@ -805,10 +805,7 @@
 	key.scope = RT_SCOPE_UNIVERSE;
 
 #ifdef CONFIG_DECNET_ROUTE_FWMASK
-	if (skb->nfreason == NF_REASON_FOR_ROUTING)
-		key.fwmark = skb->fwmark;
-	else
-		key.fwmark = 0;
+	key.fwmark = skb->fwmark;
 #else
 	key.fwmark = 0;
 #endif
@@ -886,9 +883,7 @@
 				(rt->key.daddr == cb->dst) &&
 				(rt->key.oif == 0) &&
 #ifdef CONFIG_DECNET_ROUTE_FWMASK
-				(rt->key.fwmark == (skb->nfreason ==
-							NF_REASON_FOR_ROUTING
-							? skb->nfmark : 0)) &&
+				(rt->key.fwmark == skb->nfmark) &&
 #endif
 				(rt->key.iif == cb->iif)) {
 			rt->u.dst.lastuse = jiffies;