diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2015-03-31 20:01:47 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-03 02:52:35 +0200 |
| commit | 7ba0c47c34a1ea5bc7a24ca67309996cce0569b5 (patch) | |
| tree | d5d5cac5ffa02ddb01c4ee1d1eb47cffdcade4c5 /net | |
| parent | net: move fib_rules_unregister() under rtnl lock (diff) | |
| download | linux-7ba0c47c34a1ea5bc7a24ca67309996cce0569b5.tar.xz linux-7ba0c47c34a1ea5bc7a24ca67309996cce0569b5.zip | |
ip6mr: call del_timer_sync() in ip6mr_free_table()
We need to wait for the flying timers, since we
are going to free the mrtable right after it.
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 2f1fd9ffcb34..312e0ff47339 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(&mrt->ipmr_expire_timer); + del_timer_sync(&mrt->ipmr_expire_timer); mroute_clean_tables(mrt); kfree(mrt); } |