[PATCH RFC 1/3] net: bridge: log state when setting it

[Vivien Didelot]

Every call to br_set_state is followed by a call to br_log_state.
Directly call it within br_set_state instead.

Signed-off-by: Vivien Didelot <vivien.dide...@savoirfairelinux.com>
---
 net/bridge/br_stp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index b3cca12..077afca 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -52,6 +52,8 @@ void br_set_state(struct net_bridge_port *p, unsigned int 
state)
        if (err && err != -EOPNOTSUPP)
                br_warn(p->br, "error setting offload STP state on port 
%u(%s)\n",
                                (unsigned int) p->port_no, p->dev->name);
+       else
+               br_log_state(p);
 }
 
 /* called under bridge lock */
@@ -126,7 +128,6 @@ static void br_root_port_block(const struct net_bridge *br,
                  (unsigned int) p->port_no, p->dev->name);
 
        br_set_state(p, BR_STATE_LISTENING);
-       br_log_state(p);
        br_ifinfo_notify(RTM_NEWLINK, p);
 
        if (br->forward_delay > 0)
@@ -407,7 +408,6 @@ static void br_make_blocking(struct net_bridge_port *p)
                        br_topology_change_detection(p->br);
 
                br_set_state(p, BR_STATE_BLOCKING);
-               br_log_state(p);
                br_ifinfo_notify(RTM_NEWLINK, p);
 
                del_timer(&p->forward_delay_timer);
@@ -431,7 +431,6 @@ static void br_make_forwarding(struct net_bridge_port *p)
        else
                br_set_state(p, BR_STATE_LEARNING);
 
-       br_log_state(p);
        br_ifinfo_notify(RTM_NEWLINK, p);
 
        if (br->forward_delay != 0)
-- 
2.7.1