From patchwork Thu Nov 10 16:18:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Brunck X-Patchwork-Id: 124960 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9C1E25DC9C for ; Fri, 11 Nov 2011 03:30:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935211Ab1KJQaJ (ORCPT ); Thu, 10 Nov 2011 11:30:09 -0500 Received: from mail.de.keymile.com ([195.8.104.1]:48213 "HELO mail.de.keymile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756692Ab1KJQaI (ORCPT ); Thu, 10 Nov 2011 11:30:08 -0500 X-Greylist: delayed 655 seconds by postgrey-1.27 at vger.kernel.org; Thu, 10 Nov 2011 11:30:07 EST Received: from mailrelay.de.keymile.net ([10.9.1.54]) by eSafe SMTP Relay 1320748237; Thu, 10 Nov 2011 17:19:03 +0100 Received: from pc005093.de.keymile.net (pc005093.de.keymile.net [172.30.2.67]) by mailrelay.de.keymile.net (8.12.2/8.12.2) with ESMTP id pAAGIfjO019520; Thu, 10 Nov 2011 17:18:41 +0100 (MET) From: Holger Brunck To: netdev@vger.kernel.org Cc: Wolfgang Fritz , Holger Brunck , Stephen Hemminger , "David S. Miller" , bridge@lists.linux-foundation.org Subject: [PATCH] net, bridge: print log message after state changed Date: Thu, 10 Nov 2011 17:18:54 +0100 Message-Id: <1320941934-3534-1-git-send-email-holger.brunck@keymile.com> X-Mailer: git-send-email 1.7.1 X-ESAFE-STATUS: [srvhellgate.de.keymile.net] Mail clean Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wolfgang Fritz 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 Signed-off-by: Holger Brunck cc: Stephen Hemminger cc: "David S. Miller" cc: bridge@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)