1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index ee4aa43ad973..2fbc71d90187 100644
--- a/net/ipv6/fib6_rules.c
+++ b/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