From: Wolfgang Fritz <wolfgang.fritz@xxxxxxxxxxx> Function br_log_state writes log message "... entering XXXX state" so it should be called after the state has changed and not before. Signed-off-by: Wolfgang Fritz <wolfgang.fritz@xxxxxxxxxxx> Signed-off-by: Holger Brunck <holger.brunck@xxxxxxxxxxx> cc: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx> cc: "David S. Miller" <davem@xxxxxxxxxxxxx> cc: bridge@xxxxxxxxxxxxxxxxxxxxxxxxxx --- net/bridge/br_stp_if.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 19308e3..e91be40 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -98,8 +98,6 @@ void br_stp_disable_port(struct net_bridge_port *p) struct net_bridge *br = p->br; int wasroot; - br_log_state(p); - wasroot = br_is_root_bridge(br); br_become_designated_port(p); p->state = BR_STATE_DISABLED; @@ -121,6 +119,8 @@ void br_stp_disable_port(struct net_bridge_port *p) if (br_is_root_bridge(br) && !wasroot) br_become_root_bridge(br); + + br_log_state(p); } static void br_stp_start(struct net_bridge *br) -- 1.7.1 _______________________________________________ Bridge mailing list Bridge@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/bridge
