public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 08:44:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rocker: rocker_main: Ignore bridge VLAN events

Browse source 
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>
This commit is contained in:
Petr Machata 2018-05-30 02:58:36 +02:00 • committed by David S. Miller
parent ea47217519
commit 2855118fda
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/ethernet/rocker/rocker_main.c
View file

@ -1632,6 +1632,9 @@ rocker_world_port_obj_vlan_add(struct rocker_port *rocker_port,
{ {
struct rocker_world_ops *wops = rocker_port->rocker->wops; 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) if (!wops->port_obj_vlan_add)
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -1647,6 +1650,9 @@ rocker_world_port_obj_vlan_del(struct rocker_port *rocker_port,
{ {
struct rocker_world_ops *wops = rocker_port->rocker->wops; 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) if (!wops->port_obj_vlan_del)
return -EOPNOTSUPP; return -EOPNOTSUPP;
return wops->port_obj_vlan_del(rocker_port, vlan); return wops->port_obj_vlan_del(rocker_port, vlan);