projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
treewide: Convert del_timer*() to timer_shutdown*()
[linux-block.git]
/
net
/
tipc
/
discover.c
diff --git
a/net/tipc/discover.c
b/net/tipc/discover.c
index e8dcdf267c0c3f79f43800bcceb4d1767e7704ce..685389d4b245eac3d30a61b6442d0044e928523f 100644
(file)
--- a/
net/tipc/discover.c
+++ b/
net/tipc/discover.c
@@
-388,7
+388,7
@@
int tipc_disc_create(struct net *net, struct tipc_bearer *b,
*/
void tipc_disc_delete(struct tipc_discoverer *d)
{
-
del_timer
_sync(&d->timer);
+
timer_shutdown
_sync(&d->timer);
kfree_skb(d->skb);
kfree(d);
}