net: dsa: add port enable and disable helpers

Provide dsa_port_enable and dsa_port_disable helpers to respectively
enable and disable a switch port. This makes the dsa_port_set_state_now
helper static.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 9803952a5b40040d8c7cc6ae00b026fe414d4f14..0298a0f6a349c336c9453154fa28983508ae7aea 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -117,7 +117,8 @@ void dsa_master_ethtool_restore(struct net_device *dev);
 /* port.c */
 int dsa_port_set_state(struct dsa_port *dp, u8 state,
                       struct switchdev_trans *trans);
-void dsa_port_set_state_now(struct dsa_port *dp, u8 state);
+int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy);
+void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy);
 int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br);
 void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br);
 int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,

diff --git a/net/dsa/port.c b/net/dsa/port.c
index 76d43a82d39731a616a9cb3e1cc176a3e8c04f7e..72c8dbd3d3f2d3cf0bd038960235ed46d00cfb27 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -56,7 +56,7 @@ int dsa_port_set_state(struct dsa_port *dp, u8 state,
        return 0;
 }
 
-void dsa_port_set_state_now(struct dsa_port *dp, u8 state)
+static void dsa_port_set_state_now(struct dsa_port *dp, u8 state)
 {
        int err;
 
@@ -65,6 +65,35 @@ void dsa_port_set_state_now(struct dsa_port *dp, u8 state)
                pr_err("DSA: failed to set STP state %u (%d)\n", state, err);
 }
 
+int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy)
+{
+       u8 stp_state = dp->bridge_dev ? BR_STATE_BLOCKING : BR_STATE_FORWARDING;
+       struct dsa_switch *ds = dp->ds;
+       int port = dp->index;
+       int err;
+
+       if (ds->ops->port_enable) {
+               err = ds->ops->port_enable(ds, port, phy);
+               if (err)
+                       return err;
+       }
+
+       dsa_port_set_state_now(dp, stp_state);
+
+       return 0;
+}
+
+void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy)
+{
+       struct dsa_switch *ds = dp->ds;
+       int port = dp->index;
+
+       dsa_port_set_state_now(dp, BR_STATE_DISABLED);
+
+       if (ds->ops->port_disable)
+               ds->ops->port_disable(ds, port, phy);
+}
+
 int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br)
 {
        struct dsa_notifier_bridge_info info = {

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index c2bb485790321edb6a7466d45be6d237dd6ab216..bd51ef56ec5b8aae4dc2191c1c0b476b96067c71 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -73,9 +73,7 @@ static int dsa_slave_open(struct net_device *dev)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
        struct dsa_port *dp = p->dp;
-       struct dsa_switch *ds = dp->ds;
        struct net_device *master = dsa_master_netdev(p);
-       u8 stp_state = dp->bridge_dev ? BR_STATE_BLOCKING : BR_STATE_FORWARDING;
        int err;
 
        if (!(master->flags & IFF_UP))
@@ -98,13 +96,9 @@ static int dsa_slave_open(struct net_device *dev)
                        goto clear_allmulti;
        }
 
-       if (ds->ops->port_enable) {
-               err = ds->ops->port_enable(ds, p->dp->index, p->phy);
-               if (err)
-                       goto clear_promisc;
-       }
-
-       dsa_port_set_state_now(p->dp, stp_state);
+       err = dsa_port_enable(dp, p->phy);
+       if (err)
+               goto clear_promisc;
 
        if (p->phy)
                phy_start(p->phy);
@@ -128,15 +122,12 @@ static int dsa_slave_close(struct net_device *dev)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
        struct net_device *master = dsa_master_netdev(p);
-       struct dsa_switch *ds = p->dp->ds;
+       struct dsa_port *dp = p->dp;
 
        if (p->phy)
                phy_stop(p->phy);
 
-       dsa_port_set_state_now(p->dp, BR_STATE_DISABLED);
-
-       if (ds->ops->port_disable)
-               ds->ops->port_disable(ds, p->dp->index, p->phy);
+       dsa_port_disable(dp, p->phy);
 
        dev_mc_unsync(master, dev);
        dev_uc_unsync(master, dev);