From: David Ahern <dsa@cumulusnetworks.com>
Date: Thu, 13 Apr 2017 16:57:15 +0000 (-0600)
Subject: net: vrf: Fix setting NLM_F_EXCL flag when adding l3mdev rule
X-Git-Tag: v4.10.14~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c526d0869a3aae261cbe542f1d539673d95b2b07;p=thirdparty%2Fkernel%2Fstable.git

net: vrf: Fix setting NLM_F_EXCL flag when adding l3mdev rule

[ Upstream commit 426c87caa2b4578b43cd3f689f02c65b743b2559 ]

Only need 1 l3mdev FIB rule. Fix setting NLM_F_EXCL in the nlmsghdr.

Fixes: 1aa6c4f6b8cd8 ("net: vrf: Add l3mdev rules on first device create")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 921fef275ea4b..f2fd52e71a5ed 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -1126,7 +1126,7 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it)
 		goto nla_put_failure;
 
 	/* rule only needs to appear once */
-	nlh->nlmsg_flags &= NLM_F_EXCL;
+	nlh->nlmsg_flags |= NLM_F_EXCL;
 
 	frh = nlmsg_data(nlh);
 	memset(frh, 0, sizeof(*frh));