From: Vladimir Oltean <olteanv@gmail.com>
To: f.fainelli@gmail.com, vivien.didelot@gmail.com, andrew@lunn.ch,
davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
georg.waibel@sensor-technik.de,
Vladimir Oltean <olteanv@gmail.com>
Subject: [PATCH v2 net-next 03/22] net: dsa: Store vlan_filtering as a property of dsa_port
Date: Wed, 10 Apr 2019 03:56:41 +0300 [thread overview]
Message-ID: <20190410005700.31582-4-olteanv@gmail.com> (raw)
In-Reply-To: <20190410005700.31582-1-olteanv@gmail.com>
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>
---
Changes in v2:
None
include/net/dsa.h | 1 +
net/dsa/port.c | 12 ++++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index ae480bba11f5..a16fd577349b 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -142,6 +142,7 @@ struct dsa_port {
const struct dsa_port *cpu_dp;
struct device_node *dn;
unsigned int ageing_time;
+ bool vlan_filtering;
u8 stp_state;
struct net_device *bridge_dev;
struct devlink_port devlink_port;
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;
}
--
2.17.1
next prev parent reply other threads:[~2019-04-10 0:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-10 0:56 [PATCH v2 net-next 00/22] NXP SJA1105 DSA driver Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 01/22] lib: Add support for generic packing operations Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 02/22] net: dsa: Fix pharse -> phase typo Vladimir Oltean
2019-04-10 1:57 ` Florian Fainelli
2019-04-10 0:56 ` Vladimir Oltean [this message]
2019-04-10 0:56 ` [PATCH v2 net-next 04/22] net: dsa: mt7530: Use vlan_filtering property from dsa_port Vladimir Oltean
2019-04-10 1:57 ` Florian Fainelli
2019-04-10 0:56 ` [PATCH v2 net-next 05/22] net: dsa: Add more convenient functions for installing port VLANs Vladimir Oltean
2019-04-10 2:01 ` Florian Fainelli
2019-04-10 20:15 ` Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 06/22] net: dsa: Call driver's setup callback after setting up its switchdev notifier Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 07/22] ether: Add dedicated Ethertype for pseudo-802.1Q DSA tagging Vladimir Oltean
2019-04-10 2:04 ` Florian Fainelli
2019-04-10 21:31 ` Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 08/22] net: dsa: Optional VLAN-based port separation for switches without tagging Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 09/22] net: dsa: Be aware of switches where VLAN filtering is a global setting Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 10/22] net: dsa: b53: Let DSA handle mismatched VLAN filtering settings Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 11/22] net: dsa: Allow drivers to modulate between presence and absence of tagging Vladimir Oltean
2019-04-10 2:17 ` Florian Fainelli
2019-04-10 21:52 ` Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 12/22] net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 13/22] net: dsa: sja1105: Add support for FDB and MDB management Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 14/22] net: dsa: sja1105: Add support for VLAN operations Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 15/22] net: dsa: sja1105: Add support for ethtool port counters Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 16/22] net: dsa: sja1105: Add support for traffic through standalone ports Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 17/22] net: dsa: sja1105: Add support for Spanning Tree Protocol Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 18/22] net: dsa: sja1105: Error out if RGMII delays are requested in DT Vladimir Oltean
2019-04-10 2:15 ` Florian Fainelli
2019-04-10 0:56 ` [PATCH v2 net-next 19/22] net: dsa: sja1105: Prevent PHY jabbering during switch reset Vladimir Oltean
2019-04-10 0:56 ` [PATCH v2 net-next 20/22] net: dsa: sja1105: Reject unsupported link modes for AN Vladimir Oltean
2019-04-10 2:09 ` Florian Fainelli
2019-04-10 0:56 ` [PATCH v2 net-next 21/22] Documentation: networking: dsa: Add details about NXP SJA1105 driver Vladimir Oltean
2019-04-10 0:57 ` [PATCH v2 net-next 22/22] dt-bindings: net: dsa: Add documentation for " Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190410005700.31582-4-olteanv@gmail.com \
--to=olteanv@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=georg.waibel@sensor-technik.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).