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

Signed-off-by: Petr Machata <pe...@mellanox.com>
---
 drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c 
b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index c723a04..a17dd29 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -719,6 +719,9 @@ static int port_vlans_add(struct net_device *netdev,
        struct ethsw_port_priv *port_priv = netdev_priv(netdev);
        int vid, err;
 
+       if (netif_is_bridge_master(vlan->obj.orig_dev))
+               return -EOPNOTSUPP;
+
        if (switchdev_trans_ph_prepare(trans))
                return 0;
 
@@ -873,6 +876,9 @@ static int port_vlans_del(struct net_device *netdev,
        struct ethsw_port_priv *port_priv = netdev_priv(netdev);
        int vid, err;
 
+       if (netif_is_bridge_master(vlan->obj.orig_dev))
+               return -EOPNOTSUPP;
+
        for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) {
                err = ethsw_port_del_vlan(port_priv, vid);
                if (err)
-- 
2.4.11

Reply via email to