git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
x25
/
x25_timer.c
diff --git
a/net/x25/x25_timer.c
b/net/x25/x25_timer.c
index
949faa7
..
71ff308
100644
(file)
--- a/
net/x25/x25_timer.c
+++ b/
net/x25/x25_timer.c
@@
-23,7
+23,7
@@
#include <linux/jiffies.h>
#include <linux/timer.h>
#include <net/sock.h>
#include <linux/jiffies.h>
#include <linux/timer.h>
#include <net/sock.h>
-#include <net/tcp.h>
+#include <net/tcp
_states
.h>
#include <net/x25.h>
static void x25_heartbeat_expiry(unsigned long);
#include <net/x25.h>
static void x25_heartbeat_expiry(unsigned long);
@@
-31,7
+31,7
@@
static void x25_timer_expiry(unsigned long);
void x25_init_timers(struct sock *sk)
{
void x25_init_timers(struct sock *sk)
{
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
init_timer(&x25->timer);
x25->timer.data = (unsigned long)sk;
init_timer(&x25->timer);
x25->timer.data = (unsigned long)sk;
@@
-54,28
+54,28
@@
void x25_stop_heartbeat(struct sock *sk)
void x25_start_t2timer(struct sock *sk)
{
void x25_start_t2timer(struct sock *sk)
{
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
mod_timer(&x25->timer, jiffies + x25->t2);
}
void x25_start_t21timer(struct sock *sk)
{
mod_timer(&x25->timer, jiffies + x25->t2);
}
void x25_start_t21timer(struct sock *sk)
{
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
mod_timer(&x25->timer, jiffies + x25->t21);
}
void x25_start_t22timer(struct sock *sk)
{
mod_timer(&x25->timer, jiffies + x25->t21);
}
void x25_start_t22timer(struct sock *sk)
{
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
mod_timer(&x25->timer, jiffies + x25->t22);
}
void x25_start_t23timer(struct sock *sk)
{
mod_timer(&x25->timer, jiffies + x25->t22);
}
void x25_start_t23timer(struct sock *sk)
{
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
mod_timer(&x25->timer, jiffies + x25->t23);
}
mod_timer(&x25->timer, jiffies + x25->t23);
}
@@
-87,7
+87,7
@@
void x25_stop_timer(struct sock *sk)
unsigned long x25_display_timer(struct sock *sk)
{
unsigned long x25_display_timer(struct sock *sk)
{
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
if (!timer_pending(&x25->timer))
return 0;
if (!timer_pending(&x25->timer))
return 0;
@@
-114,8
+114,9
@@
static void x25_heartbeat_expiry(unsigned long param)
if (sock_flag(sk, SOCK_DESTROY) ||
(sk->sk_state == TCP_LISTEN &&
sock_flag(sk, SOCK_DEAD))) {
if (sock_flag(sk, SOCK_DESTROY) ||
(sk->sk_state == TCP_LISTEN &&
sock_flag(sk, SOCK_DEAD))) {
+ bh_unlock_sock(sk);
x25_destroy_socket(sk);
x25_destroy_socket(sk);
-
goto unlock
;
+
return
;
}
break;
}
break;
@@
-128,7
+129,6
@@
static void x25_heartbeat_expiry(unsigned long param)
}
restart_heartbeat:
x25_start_heartbeat(sk);
}
restart_heartbeat:
x25_start_heartbeat(sk);
-unlock:
bh_unlock_sock(sk);
}
bh_unlock_sock(sk);
}
@@
-138,7
+138,7
@@
unlock:
*/
static inline void x25_do_timer_expiry(struct sock * sk)
{
*/
static inline void x25_do_timer_expiry(struct sock * sk)
{
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
switch (x25->state) {
switch (x25->state) {