aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-14 13:49:53 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-14 13:49:53 -0700
commit201a11c1db82247143f0fbe29b4a97f16fa3a591 (patch)
tree80be130504183e1e60ebd316985e6d5b7a3c3311
parentpktgen: bug fix in transmission headers with frags=0 (diff)
parenttipc: delete extra semicolon blocking node deletion (diff)
downloadlinux-dev-201a11c1db82247143f0fbe29b4a97f16fa3a591.tar.xz
linux-dev-201a11c1db82247143f0fbe29b4a97f16fa3a591.zip
Merge branch 'tipc-Mar14-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
-rw-r--r--net/tipc/net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c
index 8fbc7e6ae3df..68b3dd637291 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -221,7 +221,7 @@ void tipc_net_stop(void)
tipc_bearer_stop();
tipc_mode = TIPC_NODE_MODE;
tipc_bclink_stop();
- list_for_each_entry_safe(node, t_node, &tipc_node_list, list);
+ list_for_each_entry_safe(node, t_node, &tipc_node_list, list)
tipc_node_delete(node);
write_unlock_bh(&tipc_net_lock);
info("Left network mode\n");