summaryrefslogtreecommitdiff
path: root/net/bridge
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2012-08-10 01:24:44 +0000
committerDavid S. Miller <davem@davemloft.net>2012-08-14 14:33:31 -0700
commit4e3828c4bfd90b00a951cad7c8da27d1966beefe (patch)
tree032e34b6d572d279c9f015816bb674257e0b4ad0 /net/bridge
parentd30362c0712eb567334b3b66de7c40d4372f2c6f (diff)
downloadlinux-3.10-4e3828c4bfd90b00a951cad7c8da27d1966beefe.tar.gz
linux-3.10-4e3828c4bfd90b00a951cad7c8da27d1966beefe.tar.bz2
linux-3.10-4e3828c4bfd90b00a951cad7c8da27d1966beefe.zip
bridge: use list_for_each_entry() in netpoll functions
We don't delete 'p' from the list in the loop, so we can just use list_for_each_entry(). Cc: David Miller <davem@davemloft.net> Cc: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_device.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index f41ba4048c9..32211fa5b50 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);