net: bridge: add a br_set_state helper function

In preparation for being able to propagate port states to e.g: notifiers
or other kernel parts, do not manipulate the port state directly, but
instead use a helper function which will allow us to do a bit more than
just setting the state.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 5 deletions

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 3c86f0538cbb..2b047bcf42a4 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -36,6 +36,11 @@ void br_log_state(const struct net_bridge_port *p)
                 br_port_state_names[p->state]);
 }
 
+void br_set_state(struct net_bridge_port *p, unsigned int state)
+{
+        p->state = state;
+}
+
 /* called under bridge lock */
 struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no)
 {
@@ -107,7 +112,7 @@ static void br_root_port_block(const struct net_bridge *br,
         br_notice(br, "port %u(%s) tried to become root port (blocked)",
                   (unsigned int) p->port_no, p->dev->name);
 
-        p->state = BR_STATE_LISTENING;
+        br_set_state(p, BR_STATE_LISTENING);
         br_log_state(p);
         br_ifinfo_notify(RTM_NEWLINK, p);
 
@@ -387,7 +392,7 @@ static void br_make_blocking(struct net_bridge_port *p)
                     p->state == BR_STATE_LEARNING)
                         br_topology_change_detection(p->br);
 
-                p->state = BR_STATE_BLOCKING;
+                br_set_state(p, BR_STATE_BLOCKING);
                 br_log_state(p);
                 br_ifinfo_notify(RTM_NEWLINK, p);
 
@@ -404,13 +409,13 @@ static void br_make_forwarding(struct net_bridge_port *p)
                 return;
 
         if (br->stp_enabled == BR_NO_STP || br->forward_delay == 0) {
-                p->state = BR_STATE_FORWARDING;
+                br_set_state(p, BR_STATE_FORWARDING);
                 br_topology_change_detection(br);
                 del_timer(&p->forward_delay_timer);
         } else if (br->stp_enabled == BR_KERNEL_STP)
-                p->state = BR_STATE_LISTENING;
+                br_set_state(p, BR_STATE_LISTENING);
         else
-                p->state = BR_STATE_LEARNING;
+                br_set_state(p, BR_STATE_LEARNING);
 
         br_multicast_enable_port(p);
         br_log_state(p);