Merge tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / drivers / staging / fsl-dpaa2 / ethsw / ethsw.c

diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index 1c4fe64026d0eddd7216321dfe062e2bf17cb6f5..0d54564e4f382aa08df11d5a9a3e2bd1b8c2aa5c 100644 (file)
--- 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;
 
@@ -871,6 +874,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)