From: Petr Machata <petrm@mellanox.com>
To: netdev@vger.kernel.org, devel@driverdev.osuosl.org,
bridge@lists.linux-foundation.org
Cc: jiri@mellanox.com, idosch@mellanox.com, davem@davemloft.net,
razvan.stefanescu@nxp.com, gregkh@linuxfoundation.org,
stephen@networkplumber.org, andrew@lunn.ch,
vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com,
nikolay@cumulusnetworks.com, dan.carpenter@oracle.com
Subject: [PATCH net-next v4 4/8] rocker: rocker_main: Ignore bridge VLAN events
Date: Wed, 30 May 2018 02:58:36 +0200 [thread overview]
Message-ID: <bb051f82ac62a424327a81242e9120664838ad76.1527641426.git.petrm@mellanox.com> (raw)
In-Reply-To: <cover.1527641426.git.petrm@mellanox.com>
A follow-up patch enables emitting VLAN notifications for the bridge CPU
port in addition to the existing slave port notifications. These
notifications have orig_dev set to the bridge in question.
Because there's no specific support for these VLANs, just ignore the
notifications to maintain the current behavior.
Signed-off-by: Petr Machata <petrm@mellanox.com>
---
drivers/net/ethernet/rocker/rocker_main.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
index e73e4fe..aeafdb9 100644
--- a/drivers/net/ethernet/rocker/rocker_main.c
+++ b/drivers/net/ethernet/rocker/rocker_main.c
@@ -1632,6 +1632,9 @@ rocker_world_port_obj_vlan_add(struct rocker_port *rocker_port,
{
struct rocker_world_ops *wops = rocker_port->rocker->wops;
+ if (netif_is_bridge_master(vlan->obj.orig_dev))
+ return -EOPNOTSUPP;
+
if (!wops->port_obj_vlan_add)
return -EOPNOTSUPP;
@@ -1647,6 +1650,9 @@ rocker_world_port_obj_vlan_del(struct rocker_port *rocker_port,
{
struct rocker_world_ops *wops = rocker_port->rocker->wops;
+ if (netif_is_bridge_master(vlan->obj.orig_dev))
+ return -EOPNOTSUPP;
+
if (!wops->port_obj_vlan_del)
return -EOPNOTSUPP;
return wops->port_obj_vlan_del(rocker_port, vlan);
--
2.4.11
next prev parent reply other threads:[~2018-05-30 0:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 0:55 [PATCH net-next v4 0/8] net: bridge: Notify about bridge VLANs Petr Machata
2018-05-30 0:56 ` [PATCH net-next v4 1/8] net: bridge: Extract boilerplate around switchdev_port_obj_*() Petr Machata
2018-05-30 15:12 ` Nikolay Aleksandrov
2018-05-30 0:56 ` [PATCH net-next v4 2/8] net: bridge: Extract br_vlan_add_existing() Petr Machata
2018-05-30 15:15 ` Nikolay Aleksandrov
2018-05-30 0:57 ` [PATCH net-next v4 3/8] mlxsw: spectrum_switchdev: Ignore bridge VLAN events Petr Machata
2018-05-30 0:58 ` Petr Machata [this message]
2018-05-30 0:59 ` [PATCH net-next v4 5/8] dsa: port: " Petr Machata
2018-05-30 2:13 ` Florian Fainelli
2018-05-30 1:00 ` [PATCH net-next v4 6/8] staging: fsl-dpaa2: ethsw: " Petr Machata
2018-05-30 1:00 ` [PATCH net-next v4 7/8] net: bridge: Notify about bridge VLANs Petr Machata
2018-05-30 15:58 ` Nikolay Aleksandrov
2018-05-30 1:00 ` [PATCH net-next v4 8/8] mlxsw: spectrum_switchdev: Schedule respin during trans prepare Petr Machata
2018-05-31 18:14 ` [PATCH net-next v4 0/8] net: bridge: Notify about bridge VLANs 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=bb051f82ac62a424327a81242e9120664838ad76.1527641426.git.petrm@mellanox.com \
--to=petrm@mellanox.com \
--cc=andrew@lunn.ch \
--cc=bridge@lists.linux-foundation.org \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=idosch@mellanox.com \
--cc=jiri@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=razvan.stefanescu@nxp.com \
--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).