Skip to content

Commit

Permalink
staging: fsl-dpaa2: ethsw: Ignore bridge VLAN events
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Petr Machata authored and David S. Miller committed May 31, 2018
1 parent da0efa8 commit a73bceb
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/staging/fsl-dpaa2/ethsw/ethsw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit a73bceb

Please sign in to comment.