From: Vivien Didelot <vivien.didelot@gmail.com>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: netdev@vger.kernel.org, Florian Fainelli <f.fainelli@gmail.com>,
andrew@lunn.ch, davem@davemloft.net, idosch@mellanox.com,
jiri@mellanox.com, ilias.apalodimas@linaro.org,
ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com,
nikolay@cumulusnetworks.com
Subject: Re: [PATCH net-next v2 08/12] net: dsa: Add ndo_vlan_rx_{add,kill}_vid implementation
Date: Wed, 30 Jan 2019 17:38:29 -0500 [thread overview]
Message-ID: <20190130173829.GD3207@t480s.localdomain> (raw)
In-Reply-To: <20190130005548.2212-9-f.fainelli@gmail.com>
Hi Florian,
On Tue, 29 Jan 2019 16:55:44 -0800, Florian Fainelli <f.fainelli@gmail.com> wrote:
> - if (br_vlan_enabled(dp->bridge_dev))
> + /* Can be called from dsa_slave_port_obj_add() or
> + * dsa_slave_vlan_rx_add_vid()
> + */
> + if ((dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) ||
> + !dp->bridge_dev)
if (!dp->bridge_dev || br_vlan_enabled(dp->bridge_dev))
This would be sufficient.
>
> return 0;
> @@ -270,7 +274,11 @@ int dsa_port_vlan_del(struct dsa_port *dp,
> if (netif_is_bridge_master(vlan->obj.orig_dev))
> return -EOPNOTSUPP;
>
> - if (br_vlan_enabled(dp->bridge_dev))
> + /* Can be called from dsa_slave_port_obj_del() or
> + * dsa_slave_vlan_rx_kill_vid()
> + */
> + if ((dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) ||
> + !dp->bridge_dev)
Same here.
Thanks,
Vivien
next prev parent reply other threads:[~2019-01-30 23:03 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 0:55 [PATCH net-next v2 00/12] net: dsa: management mode for bcm_sf2 Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 01/12] net: bridge: multicast: Propagate br_mc_disabled_update() return Florian Fainelli
2019-01-30 7:36 ` Ido Schimmel
2019-01-31 1:00 ` Florian Fainelli
2019-01-31 7:50 ` Ido Schimmel
2019-02-01 1:19 ` Florian Fainelli
2019-02-02 15:47 ` Ido Schimmel
2019-02-11 19:05 ` Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 02/12] net: dsa: b53: Fix default VLAN ID Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 03/12] net: dsa: b53: Properly account for VLAN filtering Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 04/12] net: systemport: Fix reception of BPDUs Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 05/12] net: dsa: b53: Define registers for IGMP snooping Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 06/12] net: dsa: b53: Add support for MDB Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 07/12] net: dsa: Add ability to program multicast filter for CPU port Florian Fainelli
2019-01-30 22:28 ` Vivien Didelot
2019-01-30 22:55 ` Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 08/12] net: dsa: Add ndo_vlan_rx_{add,kill}_vid implementation Florian Fainelli
2019-01-30 22:38 ` Vivien Didelot [this message]
2019-01-30 0:55 ` [PATCH net-next v2 09/12] net: dsa: Make VLAN filtering use DSA notifiers Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 10/12] net: dsa: Wire up multicast IGMP snooping attribute notification Florian Fainelli
2019-01-30 16:06 ` Andrew Lunn
2019-01-30 22:32 ` Florian Fainelli
2019-01-30 22:46 ` Andrew Lunn
2019-01-30 23:02 ` Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 11/12] net: dsa: b53: Add support for toggling IGMP snooping Florian Fainelli
2019-01-30 0:55 ` [PATCH net-next v2 12/12] net: dsa: bcm_sf2: Enable management mode Florian Fainelli
2019-01-30 7:38 ` [PATCH net-next v2 00/12] net: dsa: management mode for bcm_sf2 Ido Schimmel
2019-01-30 22:23 ` David Miller
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=20190130173829.GD3207@t480s.localdomain \
--to=vivien.didelot@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=idosch@mellanox.com \
--cc=ilias.apalodimas@linaro.org \
--cc=ivan.khoronzhuk@linaro.org \
--cc=jiri@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=roopa@cumulusnetworks.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).