From patchwork Thu Apr 13 16:57:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 750544 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w3n5b0GVJz9sN6 for ; Fri, 14 Apr 2017 02:57:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="Npt+4vxr"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753710AbdDMQ5U (ORCPT ); Thu, 13 Apr 2017 12:57:20 -0400 Received: from mail-pg0-f50.google.com ([74.125.83.50]:33304 "EHLO mail-pg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753074AbdDMQ5T (ORCPT ); Thu, 13 Apr 2017 12:57:19 -0400 Received: by mail-pg0-f50.google.com with SMTP id x125so33171836pgb.0 for ; Thu, 13 Apr 2017 09:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id; bh=3Qejli5M+dlrE0cWRa65xqFV7yY/DngEVEBjMqiWMVo=; b=Npt+4vxrGazL6ZkZK79zJPTB/t+YzMDcBZLX4MsAPZiAjvzjFNghfyOm4EOPKzqIEU I9lVNFuQUPL6XNrW732TJbH+g3vE0wQr92SQ43lN+68FLAShYmQNcRjg4dwBi+hNgJYA gf/AsFhHy2Qa8i/7jrm/7BBNy1P68k10kUhew= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3Qejli5M+dlrE0cWRa65xqFV7yY/DngEVEBjMqiWMVo=; b=VgBu4N+RQSo9rx6w/NKIMj5/7GR3DyJ8Jd1NwUZy+D1g174x4ntH6jGBZR8q7UhDIw UHBozLiW/+USdNpeJcr2dIs8N276xXlqWyvY+MnvpCIF3LJnf5FbNx98YpMnZKue7hHm CSzp64qWS0aAr/z+PX+NuYp61S22oCVGIupBah8icfRvBEGDZZqlkljAewWAzSWFJfN9 palbc/40smKrQfD46ZLwuRot5zODof0Zp2T5oQJ6uKIY/CFqmWd5OpKH6PyL32MhCy70 7VRA3BsEhJhTioNumXsFgiE9QE9yizt/KJKJt3RT6D0m7Jusg0BSpi0Bbf00xvbfWbBi r9tA== X-Gm-Message-State: AN3rC/7zl17G50ODE1Pd3U+zuGAm6l5CGamVuwIAwSPOgbwrYhYIiVH6 OdJaJmf6EtKdz74M X-Received: by 10.99.209.5 with SMTP id k5mr4190800pgg.58.1492102638594; Thu, 13 Apr 2017 09:57:18 -0700 (PDT) Received: from dsa.it.cumulusnetworks.com. ([216.129.126.118]) by smtp.googlemail.com with ESMTPSA id r67sm43541757pfb.125.2017.04.13.09.57.17 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Apr 2017 09:57:18 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: David Ahern Subject: [PATCH net] net: vrf: Fix setting NLM_F_EXCL flag when adding l3mdev rule Date: Thu, 13 Apr 2017 10:57:15 -0600 Message-Id: <20170413165715.10365-1-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/vrf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 22379da63400..6a6e7f2fee29 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -1125,7 +1125,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));