From patchwork Wed Apr 28 01:01:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 51140 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 4DAC0B7D52 for ; Wed, 28 Apr 2010 11:08:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755349Ab0D1BHX (ORCPT ); Tue, 27 Apr 2010 21:07:23 -0400 Received: from suva.vyatta.com ([76.74.103.44]:46582 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754277Ab0D1BHW (ORCPT ); Tue, 27 Apr 2010 21:07:22 -0400 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id o3S16ChA008010; Tue, 27 Apr 2010 18:06:12 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id o3S167dE008007; Tue, 27 Apr 2010 18:06:07 -0700 Message-Id: <20100428010336.317810041@vyatta.com> References: <20100428010103.386761596@vyatta.com> User-Agent: quilt/0.46-1 Date: Tue, 27 Apr 2010 18:01:07 -0700 From: Stephen Hemminger To: "David S. Miller" , Herbert Xu Cc: netdev@vger.kernel.org Subject: [PATCH net-next 4/4] bridge: multicast_flood cleanup Content-Disposition: inline; filename=br-flood-clean.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move some declarations around to make it clearer which variables are being used inside loop. Signed-off-by: Stephen Hemminger --- a/net/bridge/br_forward.c 2010-04-27 17:58:25.739592056 -0700 +++ b/net/bridge/br_forward.c 2010-04-27 17:59:17.182654034 -0700 @@ -208,17 +208,15 @@ static void br_multicast_flood(struct ne { struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev; struct net_bridge *br = netdev_priv(dev); - struct net_bridge_port *port; - struct net_bridge_port *lport, *rport; - struct net_bridge_port *prev; + struct net_bridge_port *prev = NULL; struct net_bridge_port_group *p; struct hlist_node *rp; - prev = NULL; - rp = rcu_dereference(br->router_list.first); p = mdst ? rcu_dereference(mdst->ports) : NULL; while (p || rp) { + struct net_bridge_port *port, *lport, *rport; + lport = p ? p->port : NULL; rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) : NULL;