summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-06-11 13:32:31 -0700
committerDavid S. Miller <davem@davemloft.net>2010-06-11 13:32:31 -0700
commit62522d36d74a843e78d17f2dffc90468c6762803 (patch)
treed9d21de6724425c1b0ba12991e0865556aeda6b4 /net/ipv4/ipmr.c
parenta71fba97295db924c0b90266e9833e5059fead24 (diff)
parente79aa8671033535c2e9ffc0a68010ae49ed5734c (diff)
downloadlinux-62522d36d74a843e78d17f2dffc90468c6762803.tar.bz2
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r--net/ipv4/ipmr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 8418afc357ee..539592294f45 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -267,8 +267,10 @@ static void __net_exit ipmr_rules_exit(struct net *net)
{
struct mr_table *mrt, *next;
- list_for_each_entry_safe(mrt, next, &net->ipv4.mr_tables, list)
+ list_for_each_entry_safe(mrt, next, &net->ipv4.mr_tables, list) {
+ list_del(&mrt->list);
kfree(mrt);
+ }
fib_rules_unregister(net->ipv4.mr_rules_ops);
}
#else