diff options
| author | Petr Machata <petrm@mellanox.com> | 2018-05-30 02:59:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-31 14:13:43 -0400 |
| commit | da0efa8888ee268ff7db74389a5e4fc32ade457a (patch) | |
| tree | c2aebebfc14c9a48642bde7a7b57ad216c5a6eb0 /net/dsa | |
| parent | 2855118fdafa753d284b80abd7835a530b5a6fcc (diff) | |
| download | linux-da0efa8888ee268ff7db74389a5e4fc32ade457a.tar.bz2 | |
dsa: port: 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>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/port.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/dsa/port.c b/net/dsa/port.c index 2413beb995be..ed0595459df1 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -252,6 +252,9 @@ int dsa_port_vlan_add(struct dsa_port *dp, .vlan = vlan, }; + if (netif_is_bridge_master(vlan->obj.orig_dev)) + return -EOPNOTSUPP; + if (br_vlan_enabled(dp->bridge_dev)) return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info); @@ -267,6 +270,9 @@ int dsa_port_vlan_del(struct dsa_port *dp, .vlan = vlan, }; + if (netif_is_bridge_master(vlan->obj.orig_dev)) + return -EOPNOTSUPP; + if (br_vlan_enabled(dp->bridge_dev)) return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info); |