[PATCH 3.16.y-ckt 100/126] ip6mr: call del_timer_sync() in ip6mr_free_table()

[Luis Henriques]

3.16.7-ckt22 -stable review patch.  If anyone has any objections, please let me 
know.

--

From: WANG Cong 

commit 7ba0c47c34a1ea5bc7a24ca67309996cce0569b5 upstream.

We need to wait for the flying timers, since we
are going to free the mrtable right after it.

Cc: Hannes Frederic Sowa 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller 
Cc: Ben Hutchings 
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques 
---
 net/ipv6/ip6mr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 72f3baee76d9..5e739bb6ae90 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -336,7 +336,7 @@ static struct mr6_table *ip6mr_new_table(struct net *net, 
u32 id)
 
 static void ip6mr_free_table(struct mr6_table *mrt)
 {
-   del_timer(>ipmr_expire_timer);
+   del_timer_sync(>ipmr_expire_timer);
mroute_clean_tables(mrt, true);
kfree(mrt);
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 3.16.y-ckt 100/126] ip6mr: call del_timer_sync() in ip6mr_free_table()

[Luis Henriques]

3.16.7-ckt22 -stable review patch.  If anyone has any objections, please let me 
know.

--

From: WANG Cong 

commit 7ba0c47c34a1ea5bc7a24ca67309996cce0569b5 upstream.

We need to wait for the flying timers, since we
are going to free the mrtable right after it.

Cc: Hannes Frederic Sowa 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller 
Cc: Ben Hutchings 
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques 
---
 net/ipv6/ip6mr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 72f3baee76d9..5e739bb6ae90 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -336,7 +336,7 @@ static struct mr6_table *ip6mr_new_table(struct net *net, 
u32 id)
 
 static void ip6mr_free_table(struct mr6_table *mrt)
 {
-   del_timer(>ipmr_expire_timer);
+   del_timer_sync(>ipmr_expire_timer);
mroute_clean_tables(mrt, true);
kfree(mrt);
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/