From 1b66ee0bb82b9541f8921277d9615801a924a0b2 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sat, 26 Aug 2006 16:50:20 -0700
Subject: [PATCH] --- yaml --- r: 34632 b: refs/heads/master c:
 366e4adc0f9ef33f56c62f980a7d83775e64abd0 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/fib6_rules.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 35b1fb9ee742..e11d405e601e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74975d40b16fd4bad24a2e2630dc7957d8cba013
+refs/heads/master: 366e4adc0f9ef33f56c62f980a7d83775e64abd0
diff --git a/trunk/net/ipv6/fib6_rules.c b/trunk/net/ipv6/fib6_rules.c
index ee4aa43ad973..2fbc71d90187 100644
--- a/trunk/net/ipv6/fib6_rules.c
+++ b/trunk/net/ipv6/fib6_rules.c
@@ -129,7 +129,7 @@ static int fib6_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)
 		return 0;
 
 #ifdef CONFIG_IPV6_ROUTE_FWMARK
-	if ((r->fwmark ^ fl->fl6_fwmark) / r->fwmask)
+	if ((r->fwmark ^ fl->fl6_fwmark) & r->fwmask)
 		return 0;
 #endif
 
@@ -256,7 +256,7 @@ static int fib6_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
 	if (rule6->fwmark)
 		NLA_PUT_U32(skb, FRA_FWMARK, rule6->fwmark);
 
-	if (rule6->fwmask)
+	if (rule6->fwmask || rule6->fwmark)
 		NLA_PUT_U32(skb, FRA_FWMASK, rule6->fwmask);
 #endif