projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill the obsolete thread_group_cputime_free() helper
[cascardo/linux.git]
/
net
/
x25
/
x25_timer.c
diff --git
a/net/x25/x25_timer.c
b/net/x25/x25_timer.c
index
2af190d
..
5c5db1a
100644
(file)
--- a/
net/x25/x25_timer.c
+++ b/
net/x25/x25_timer.c
@@
-33,9
+33,7
@@
void x25_init_timers(struct sock *sk)
{
struct x25_sock *x25 = x25_sk(sk);
{
struct x25_sock *x25 = x25_sk(sk);
- init_timer(&x25->timer);
- x25->timer.data = (unsigned long)sk;
- x25->timer.function = &x25_timer_expiry;
+ setup_timer(&x25->timer, x25_timer_expiry, (unsigned long)sk);
/* initialized by sock_init_data */
sk->sk_timer.data = (unsigned long)sk;
/* initialized by sock_init_data */
sk->sk_timer.data = (unsigned long)sk;
@@
-115,7
+113,7
@@
static void x25_heartbeat_expiry(unsigned long param)
(sk->sk_state == TCP_LISTEN &&
sock_flag(sk, SOCK_DEAD))) {
bh_unlock_sock(sk);
(sk->sk_state == TCP_LISTEN &&
sock_flag(sk, SOCK_DEAD))) {
bh_unlock_sock(sk);
- x25_destroy_socket(sk);
+ x25_destroy_socket
_from_timer
(sk);
return;
}
break;
return;
}
break;