projects
/
linux-2.6-microblaze.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-2.6-microblaze.git]
/
net
/
tipc
/
monitor.c
diff --git
a/net/tipc/monitor.c
b/net/tipc/monitor.c
index
9618e44
..
77a3d01
100644
(file)
--- a/
net/tipc/monitor.c
+++ b/
net/tipc/monitor.c
@@
-700,7
+700,7
@@
void tipc_mon_delete(struct net *net, int bearer_id)
}
mon->self = NULL;
write_unlock_bh(&mon->lock);
-
del_timer
_sync(&mon->timer);
+
timer_shutdown
_sync(&mon->timer);
kfree(self->domain);
kfree(self);
kfree(mon);