switchdev: convert STP update to switchdev attr set

STP update is just a settable port attribute, so convert
switchdev_port_stp_update to an attr set.

For DSA, the prepare phase is skipped and STP updates are only done in the
commit phase.  This is because currently the DSA drivers don't need to
allocate any memory for STP updates and the STP update will not fail to HW
(unless something horrible goes wrong on the MDIO bus, in which case the
prepare phase wouldn't have been able to predict anyway).

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 19 insertions, 1 deletions

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index de705b674ac9..3fb5210e318c 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -345,6 +345,24 @@ static int dsa_slave_stp_update(struct net_device *dev, u8 state)
         return ret;
 }
 
+static int dsa_slave_port_attr_set(struct net_device *dev,
+                                   struct switchdev_attr *attr)
+{
+        int ret = 0;
+
+        switch (attr->id) {
+        case SWITCHDEV_ATTR_PORT_STP_STATE:
+                if (attr->trans == SWITCHDEV_TRANS_COMMIT)
+                        ret = dsa_slave_stp_update(dev, attr->stp_state);
+                break;
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+        return ret;
+}
+
 static int dsa_slave_bridge_port_join(struct net_device *dev,
                                       struct net_device *br)
 {
@@ -683,7 +701,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
 
 static const struct switchdev_ops dsa_slave_switchdev_ops = {
         .switchdev_port_attr_get        = dsa_slave_port_attr_get,
-        .switchdev_port_stp_update      = dsa_slave_stp_update,
+        .switchdev_port_attr_set        = dsa_slave_port_attr_set,
 };
 
 static void dsa_slave_adjust_link(struct net_device *dev)