[PATCH net-next v3 3/7] rocker: rocker_main: Ignore bridge VLAN events

[Petr Machata]

Ignore VLAN events where the orig_dev is the bridge device itself.

Signed-off-by: Petr Machata <pe...@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