From patchwork Wed May 17 21:27:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Didelot X-Patchwork-Id: 763771 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 3wSncP3FKpz9s4q for ; Thu, 18 May 2017 07:33:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753599AbdEQV3m (ORCPT ); Wed, 17 May 2017 17:29:42 -0400 Received: from mail.savoirfairelinux.com ([208.88.110.44]:52280 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753004AbdEQV3Q (ORCPT ); Wed, 17 May 2017 17:29:16 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 1C1CF9C204E; Wed, 17 May 2017 17:29:15 -0400 (EDT) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id enYFEa6euq9f; Wed, 17 May 2017 17:29:14 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 6F5F09C2051; Wed, 17 May 2017 17:29:14 -0400 (EDT) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Qvc7poGB08-1; Wed, 17 May 2017 17:29:14 -0400 (EDT) Received: from weeman.mtl.sfl (unknown [192.168.49.104]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 322189C2060; Wed, 17 May 2017 17:29:14 -0400 (EDT) From: Vivien Didelot To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" , Vivien Didelot , Stephen Hemminger , bridge@lists.linux-foundation.org (moderated list:ETHERNET BRIDGE) Subject: [PATCH net-next 5/6] net: bridge: get msgtype from nlmsghdr in mdb ops Date: Wed, 17 May 2017 17:27:08 -0400 Message-Id: <20170517212709.6473-6-vivien.didelot@savoirfairelinux.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170517212709.6473-1-vivien.didelot@savoirfairelinux.com> References: <20170517212709.6473-1-vivien.didelot@savoirfairelinux.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Retrieve the message type from the nlmsghdr structure instead of hardcoding it in both br_mdb_add and br_mdb_del. Signed-off-by: Vivien Didelot --- net/bridge/br_mdb.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index a72d5e6f339f..d280b20587cb 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -569,6 +569,7 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, struct net_bridge_port *p; struct net_bridge_vlan *v; struct net_bridge *br; + int msgtype = nlh->nlmsg_type; int err; err = br_mdb_parse(skb, nlh, &dev, &entry); @@ -595,12 +596,12 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, if (br_vlan_enabled(br) && vg && entry->vid == 0) { list_for_each_entry(v, &vg->vlan_list, vlist) { entry->vid = v->vid; - err = __br_mdb_do(p, entry, RTM_NEWMDB); + err = __br_mdb_do(p, entry, msgtype); if (err) break; } } else { - err = __br_mdb_do(p, entry, RTM_NEWMDB); + err = __br_mdb_do(p, entry, msgtype); } return err; @@ -677,6 +678,7 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, struct net_bridge_port *p; struct net_bridge_vlan *v; struct net_bridge *br; + int msgtype = nlh->nlmsg_type; int err; err = br_mdb_parse(skb, nlh, &dev, &entry); @@ -703,12 +705,12 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, if (br_vlan_enabled(br) && vg && entry->vid == 0) { list_for_each_entry(v, &vg->vlan_list, vlist) { entry->vid = v->vid; - err = __br_mdb_do(p, entry, RTM_DELMDB); + err = __br_mdb_do(p, entry, msgtype); if (err) break; } } else { - err = __br_mdb_do(p, entry, RTM_DELMDB); + err = __br_mdb_do(p, entry, msgtype); } return err;