Holger Brunck
2011-Nov-10 16:18 UTC
[Bridge] [PATCH] net, bridge: print log message after state changed
From: Wolfgang Fritz <wolfgang.fritz at keymile.com> 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 at keymile.com> Signed-off-by: Holger Brunck <holger.brunck at keymile.com> cc: Stephen Hemminger <shemminger at linux-foundation.org> cc: "David S. Miller" <davem at davemloft.net> cc: bridge at lists.linux-foundation.org --- 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
David Miller
2011-Nov-14 05:37 UTC
[Bridge] [PATCH] net, bridge: print log message after state changed
From: Holger Brunck <holger.brunck at keymile.com> Date: Thu, 10 Nov 2011 17:18:54 +0100> From: Wolfgang Fritz <wolfgang.fritz at keymile.com> > > 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 at keymile.com> > Signed-off-by: Holger Brunck <holger.brunck at keymile.com>"entering" can roughly mean "about to enter" The message is therefore appropriately timed as far as I'm concerned. I'm not applying this patch.