From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
To: Vivien Didelot <vivien.didelot@savoirfairelinux.com>,
netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com,
"David S. Miller" <davem@davemloft.net>,
Stephen Hemminger <stephen@networkplumber.org>,
"moderated list:ETHERNET BRIDGE"
<bridge@lists.linux-foundation.org>
Subject: Re: [PATCH net-next 5/6] net: bridge: get msgtype from nlmsghdr in mdb ops
Date: Thu, 18 May 2017 18:28:46 +0300 [thread overview]
Message-ID: <ee5d9736-72ec-f4fd-8e9b-2c4179687e16@cumulusnetworks.com> (raw)
In-Reply-To: <20170517212709.6473-6-vivien.didelot@savoirfairelinux.com>
On 5/18/17 12:27 AM, Vivien Didelot wrote:
> 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 <vivien.didelot@savoirfairelinux.com>
> ---
> 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;
minor nits:
nlmsg_type is a u16, also please keep the order and arrange these from longest
to shortest
> 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;
same here
> 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;
>
next prev parent reply other threads:[~2017-05-18 15:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-17 21:27 [PATCH net-next 0/6] net: bridge: factorize MDB new and del functions Vivien Didelot
2017-05-17 21:27 ` [PATCH net-next 1/6] net: bridge: pass net_bridge_port to __br_mdb_add Vivien Didelot
2017-05-17 21:27 ` [PATCH net-next 2/6] net: bridge: check multicast bridge only once Vivien Didelot
2017-05-17 21:27 ` [PATCH net-next 3/6] net: bridge: break if __br_mdb_del fails Vivien Didelot
2017-05-18 13:45 ` Nikolay Aleksandrov
2017-05-18 15:08 ` Vivien Didelot
2017-05-18 15:25 ` Nikolay Aleksandrov
2017-05-18 15:45 ` Vivien Didelot
2017-05-17 21:27 ` [PATCH net-next 4/6] net: bridge: add __br_mdb_do Vivien Didelot
2017-05-17 21:27 ` [PATCH net-next 5/6] net: bridge: get msgtype from nlmsghdr in mdb ops Vivien Didelot
2017-05-18 15:28 ` Nikolay Aleksandrov [this message]
2017-05-17 21:27 ` [PATCH net-next 6/6] net: bridge: add br_mdb_do Vivien Didelot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ee5d9736-72ec-f4fd-8e9b-2c4179687e16@cumulusnetworks.com \
--to=nikolay@cumulusnetworks.com \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=kernel@savoirfairelinux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
--cc=vivien.didelot@savoirfairelinux.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).