From 83f100aae1eb3c0718216591ba5ed3336d4a2bfc Mon Sep 17 00:00:00 2001 From: Amerigo Wang Date: Fri, 10 Aug 2012 01:24:44 +0000 Subject: [PATCH] --- yaml --- r: 321969 b: refs/heads/master c: 4e3828c4bfd90b00a951cad7c8da27d1966beefe h: refs/heads/master i: 321967: 4e7346c20209b7128bdcbe373f8a27a4c87fa4ad v: v3 --- [refs] | 2 +- trunk/net/bridge/br_device.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7d3cb70a6d17..2c44124f2e43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d30362c0712eb567334b3b66de7c40d4372f2c6f +refs/heads/master: 4e3828c4bfd90b00a951cad7c8da27d1966beefe diff --git a/trunk/net/bridge/br_device.c b/trunk/net/bridge/br_device.c index f41ba4048c9a..32211fa5b506 100644 --- a/trunk/net/bridge/br_device.c +++ b/trunk/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);