Skip to content

Commit

Permalink
rocker: rocker_main: 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 ea47217 commit 2855118
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/net/ethernet/rocker/rocker_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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

0 comments on commit 2855118

Please sign in to comment.