[PATCH 3.4 040/125] ip6mr: call del_timer_sync() in ip6mr_free_table()

From: WANG Cong <redacted>

3.4.113-rc1 review patch.  If anyone has any objections, please let me know.

------------------


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 <redacted>
Signed-off-by: Cong Wang <redacted>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Zefan Li <redacted>
---
 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 abe1f76..84cf871 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c

@@ -333,7 +333,7 @@ static struct mr6_table *ip6mr_new_table(struct net *net, u32 id)
 
 static void ip6mr_free_table(struct mr6_table *mrt)
 {
-	del_timer(&mrt->ipmr_expire_timer);
+	del_timer_sync(&mrt->ipmr_expire_timer);
 	mroute_clean_tables(mrt);
 	kfree(mrt);
 }

-- 
1.9.1