diff options
| author | Petr Machata <petrm@mellanox.com> | 2018-05-30 03:00:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-31 14:13:44 -0400 |
| commit | a73bceb86df8f1e007b7f7691d7e38bb29601943 (patch) | |
| tree | 1f85ef8b52e215d86284bc021484cdc725a43f12 | |
| parent | da0efa8888ee268ff7db74389a5e4fc32ade457a (diff) | |
| download | nfc-next-a73bceb86df8f1e007b7f7691d7e38bb29601943.tar.gz | |
staging: fsl-dpaa2: ethsw: Ignore bridge VLAN events
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c index c723a04bc3d6c0..a17dd2972ccdaf 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) |