From patchwork Mon Aug 6 14:23:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 175375 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 E7D592C00A3 for ; Tue, 7 Aug 2012 00:24:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932066Ab2HFOYG (ORCPT ); Mon, 6 Aug 2012 10:24:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29667 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756580Ab2HFOYE (ORCPT ); Mon, 6 Aug 2012 10:24:04 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q76EO4xZ028453 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Aug 2012 10:24:04 -0400 Received: from cr0.redhat.com (vpn-244-125.nrt.redhat.com [10.64.244.125]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q76ENeig023499; Mon, 6 Aug 2012 10:24:02 -0400 From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , Stephen Hemminger Subject: [PATCH 8/8] bridge: use list_for_each_entry() in netpoll functions Date: Mon, 6 Aug 2012 22:23:32 +0800 Message-Id: <1344263012-4031-9-git-send-email-amwang@redhat.com> In-Reply-To: <1344263012-4031-1-git-send-email-amwang@redhat.com> References: <1344263012-4031-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We don't delete 'p' from the list in the loop, so we can just use list_for_each_entry(). Cc: Stephen Hemminger Signed-off-by: Cong Wang Signed-off-by: Stephen Hemminger --- net/bridge/br_device.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index f41ba40..32211fa 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -206,21 +206,20 @@ static void br_poll_controller(struct net_device *br_dev) static void br_netpoll_cleanup(struct net_device *dev) { struct net_bridge *br = netdev_priv(dev); - struct net_bridge_port *p, *n; + struct net_bridge_port *p; - list_for_each_entry_safe(p, n, &br->port_list, list) { + list_for_each_entry(p, &br->port_list, list) br_netpoll_disable(p); - } } static int br_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, gfp_t gfp) { struct net_bridge *br = netdev_priv(dev); - struct net_bridge_port *p, *n; + struct net_bridge_port *p; int err = 0; - list_for_each_entry_safe(p, n, &br->port_list, list) { + list_for_each_entry(p, &br->port_list, list) { if (!p->dev) continue; err = br_netpoll_enable(p, gfp);