Merge branch 'dsa-port-fast-ageing'

[cascardo/linux.git] / net / dsa / slave.c

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 9ecbe78..6b1282c 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -69,6 +69,30 @@ static inline bool dsa_port_is_bridged(struct dsa_slave_priv *p)
        return !!p->bridge_dev;
 }
 
+static void dsa_port_set_stp_state(struct dsa_switch *ds, int port, u8 state)
+{
+       struct dsa_port *dp = &ds->ports[port];
+
+       if (ds->ops->port_stp_state_set)
+               ds->ops->port_stp_state_set(ds, port, state);
+
+       if (ds->ops->port_fast_age) {
+               /* Fast age FDB entries or flush appropriate forwarding database
+                * for the given port, if we are moving it from Learning or
+                * Forwarding state, to Disabled or Blocking or Listening state.
+                */
+
+               if ((dp->stp_state == BR_STATE_LEARNING ||
+                    dp->stp_state == BR_STATE_FORWARDING) &&
+                   (state == BR_STATE_DISABLED ||
+                    state == BR_STATE_BLOCKING ||
+                    state == BR_STATE_LISTENING))
+                       ds->ops->port_fast_age(ds, port);
+       }
+
+       dp->stp_state = state;
+}
+
 static int dsa_slave_open(struct net_device *dev)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
@@ -104,8 +128,7 @@ static int dsa_slave_open(struct net_device *dev)
                        goto clear_promisc;
        }
 
-       if (ds->ops->port_stp_state_set)
-               ds->ops->port_stp_state_set(ds, p->port, stp_state);
+       dsa_port_set_stp_state(ds, p->port, stp_state);
 
        if (p->phy)
                phy_start(p->phy);
@@ -147,8 +170,7 @@ static int dsa_slave_close(struct net_device *dev)
        if (ds->ops->port_disable)
                ds->ops->port_disable(ds, p->port, p->phy);
 
-       if (ds->ops->port_stp_state_set)
-               ds->ops->port_stp_state_set(ds, p->port, BR_STATE_DISABLED);
+       dsa_port_set_stp_state(ds, p->port, BR_STATE_DISABLED);
 
        return 0;
 }
@@ -354,7 +376,7 @@ static int dsa_slave_stp_state_set(struct net_device *dev,
        if (switchdev_trans_ph_prepare(trans))
                return ds->ops->port_stp_state_set ? 0 : -EOPNOTSUPP;
 
-       ds->ops->port_stp_state_set(ds, p->port, attr->u.stp_state);
+       dsa_port_set_stp_state(ds, p->port, attr->u.stp_state);
 
        return 0;
 }
@@ -556,8 +578,7 @@ static void dsa_slave_bridge_port_leave(struct net_device *dev)
        /* Port left the bridge, put in BR_STATE_DISABLED by the bridge layer,
         * so allow it to be in BR_STATE_FORWARDING to be kept functional
         */
-       if (ds->ops->port_stp_state_set)
-               ds->ops->port_stp_state_set(ds, p->port, BR_STATE_FORWARDING);
+       dsa_port_set_stp_state(ds, p->port, BR_STATE_FORWARDING);
 }
 
 static int dsa_slave_port_attr_get(struct net_device *dev,