diff options
author | Tony Lindgren <tony@atomide.com> | 2010-06-28 08:47:04 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-06-28 08:47:04 -0400 |
commit | 41bd03ba0758a076671e5de35ed084535984143d (patch) | |
tree | 9a669f9f1f52996b38acb077655e4b044bba67c7 /net/ipv4/ipmr.c | |
parent | 090830b4c79cd5ac85430822a9b87c90848bedcf (diff) | |
parent | dc75925d67950889b79df1cc1518c21ec678df6c (diff) |
Merge branch 'for_2.6.35rc' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 856123fe32f9..757f25eb9b4b 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) | |||
267 | { | 267 | { |
268 | struct mr_table *mrt, *next; | 268 | struct mr_table *mrt, *next; |
269 | 269 | ||
270 | list_for_each_entry_safe(mrt, next, &net->ipv4.mr_tables, list) | 270 | list_for_each_entry_safe(mrt, next, &net->ipv4.mr_tables, list) { |
271 | list_del(&mrt->list); | ||
271 | kfree(mrt); | 272 | kfree(mrt); |
273 | } | ||
272 | fib_rules_unregister(net->ipv4.mr_rules_ops); | 274 | fib_rules_unregister(net->ipv4.mr_rules_ops); |
273 | } | 275 | } |
274 | #else | 276 | #else |