summaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorVladimir Oltean <olteanv@gmail.com>2019-04-28 21:45:43 +0300
committerDavid S. Miller <davem@davemloft.net>2019-04-30 23:05:28 -0400
commit33162e9a0590f16e1b21be764caae517e2bb310c (patch)
tree92868bb5ede7bb5a76b650d19eab0f6e3bae915a /net/dsa
parent85478d73c911e3991c14c6d88b91b77455d2722d (diff)
downloadlinux-33162e9a0590f16e1b21be764caae517e2bb310c.tar.gz
linux-33162e9a0590f16e1b21be764caae517e2bb310c.tar.bz2
linux-33162e9a0590f16e1b21be764caae517e2bb310c.zip
net: dsa: Store vlan_filtering as a property of dsa_port
This allows drivers to query the VLAN setting imposed by the bridge driver directly from DSA, instead of keeping their own state based on the .port_vlan_filtering callback. Signed-off-by: Vladimir Oltean <olteanv@gmail.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.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/net/dsa/port.c b/net/dsa/port.c
index caeef4c99dc0..a86fe3be1261 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -158,15 +158,19 @@ int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,
struct switchdev_trans *trans)
{
struct dsa_switch *ds = dp->ds;
+ int err;
/* bridge skips -EOPNOTSUPP, so skip the prepare phase */
if (switchdev_trans_ph_prepare(trans))
return 0;
- if (ds->ops->port_vlan_filtering)
- return ds->ops->port_vlan_filtering(ds, dp->index,
- vlan_filtering);
-
+ if (ds->ops->port_vlan_filtering) {
+ err = ds->ops->port_vlan_filtering(ds, dp->index,
+ vlan_filtering);
+ if (err)
+ return err;
+ dp->vlan_filtering = vlan_filtering;
+ }
return 0;
}