From cb248a1160adc5e133b368339c28291978201bf9 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 6 Jun 2010 23:48:40 +0000
Subject: [PATCH] --- yaml --- r: 200266 b: refs/heads/master c:
 035320d54758e21227987e3aae0d46e7a04f4ddc h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv4/ipmr.c  | 4 +++-
 trunk/net/ipv6/ip6mr.c | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7062791913a2..6958c671df63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fd7fa4a89f0b85b9b33e922f15a2289c0fb8499
+refs/heads/master: 035320d54758e21227987e3aae0d46e7a04f4ddc
diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c
index 856123fe32f9..757f25eb9b4b 100644
--- a/trunk/net/ipv4/ipmr.c
+++ b/trunk/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
diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c
index 89c0b077c7aa..66078dad7fe8 100644
--- a/trunk/net/ipv6/ip6mr.c
+++ b/trunk/net/ipv6/ip6mr.c
@@ -254,8 +254,10 @@ static void __net_exit ip6mr_rules_exit(struct net *net)
 {
 	struct mr6_table *mrt, *next;
 
-	list_for_each_entry_safe(mrt, next, &net->ipv6.mr6_tables, list)
+	list_for_each_entry_safe(mrt, next, &net->ipv6.mr6_tables, list) {
+		list_del(&mrt->list);
 		ip6mr_free_table(mrt);
+	}
 	fib_rules_unregister(net->ipv6.mr6_rules_ops);
 }
 #else