net: bridge: log port STP state on change

Remove the shared br_log_state function and print the info directly in
br_set_state, where the net_bridge_port state is actually changed.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 40197ff8918abab433c563dd92186479652ed84d..e9c635eae24de298ac028b8d3d80034dd6d93391 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -598,7 +598,6 @@ static int br_set_port_state(struct net_bridge_port *p, u8 state)
                return -ENETDOWN;
 
        br_set_state(p, state);
-       br_log_state(p);
        br_port_state_selection(p->br);
        return 0;
 }

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 302ab0a43725845c5ec7a1ffb30db59bfaf16db5..1b5d145dfcbf28beb5d7dfd3a28fcdaf919e26aa 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -900,7 +900,6 @@ static inline void br_nf_core_fini(void) {}
 #endif
 
 /* br_stp.c */
-void br_log_state(const struct net_bridge_port *p);
 void br_set_state(struct net_bridge_port *p, unsigned int state);
 struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no);
 void br_init_port(struct net_bridge_port *p);

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index b3cca126b103d24ddaee0b13d7eb73f4e8617f3a..c22816a0b1b105e11a336a3345778f9a4e3801b2 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -30,13 +30,6 @@ static const char *const br_port_state_names[] = {
        [BR_STATE_BLOCKING] = "blocking",
 };
 
-void br_log_state(const struct net_bridge_port *p)
-{
-       br_info(p->br, "port %u(%s) entered %s state\n",
-               (unsigned int) p->port_no, p->dev->name,
-               br_port_state_names[p->state]);
-}
-
 void br_set_state(struct net_bridge_port *p, unsigned int state)
 {
        struct switchdev_attr attr = {
@@ -52,6 +45,10 @@ 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_info(p->br, "port %u(%s) entered %s state\n",
+                               (unsigned int) p->port_no, p->dev->name,
+                               br_port_state_names[p->state]);
 }
 
 /* called under bridge lock */
@@ -126,7 +123,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 +403,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 +426,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)

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index a31ac6ad76a22344e106e90ca9d943055b95ea1b..984d462630072a8a013a3ba041304564e1bd83f6 100644 (file)
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -102,7 +102,6 @@ void br_stp_enable_port(struct net_bridge_port *p)
 {
        br_init_port(p);
        br_port_state_selection(p->br);
-       br_log_state(p);
        br_ifinfo_notify(RTM_NEWLINK, p);
 }
 
@@ -118,7 +117,6 @@ void br_stp_disable_port(struct net_bridge_port *p)
        p->topology_change_ack = 0;
        p->config_pending = 0;
 
-       br_log_state(p);
        br_ifinfo_notify(RTM_NEWLINK, p);
 
        del_timer(&p->message_age_timer);

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 5f0f5af0ec35bf8c216935713a9d5f803456e1ab..da058b85aa2260c6148034917e96944eefd85e28 100644 (file)
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -98,7 +98,6 @@ static void br_forward_delay_timer_expired(unsigned long arg)
                        br_topology_change_detection(br);
                netif_carrier_on(br->dev);
        }
-       br_log_state(p);
        rcu_read_lock();
        br_ifinfo_notify(RTM_NEWLINK, p);
        rcu_read_unlock();