projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
419df12
)
ip6mr: call del_timer_sync() in ip6mr_free_table()
author
WANG Cong
<
[email protected]
>
Tue, 31 Mar 2015 18:01:47 +0000
(11:01 -0700)
committer
David S. Miller
<
[email protected]
>
Fri, 3 Apr 2015 00:52:35 +0000
(20:52 -0400)
We need to wait for the flying timers, since we
are going to free the mrtable right after it.
Cc: Hannes Frederic Sowa <
[email protected]
>
Signed-off-by: Cong Wang <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/ipv6/ip6mr.c
patch
|
blob
|
history
diff --git
a/net/ipv6/ip6mr.c
b/net/ipv6/ip6mr.c
index 2f1fd9ffcb34aacda122f996e8b5ae294350b412..312e0ff47339be3a3ffa8981c9e1b1cb7f5a551b 100644
(file)
--- 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);
}