aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-01-03 18:48:13 -0800
committerDavid S. Miller <davem@davemloft.net>2007-01-03 18:48:13 -0800
commit7f18ba6248625a587559ed1206d12ccaa3ad045e (patch)
tree4f48a5a6e167d5da2fe9a58dff76b443a99f64f6
parent5e7c001c6279f38b15fef5369496fe1043765727 (diff)
downloadkernel_samsung_smdk4412-7f18ba6248625a587559ed1206d12ccaa3ad045e.zip
kernel_samsung_smdk4412-7f18ba6248625a587559ed1206d12ccaa3ad045e.tar.gz
kernel_samsung_smdk4412-7f18ba6248625a587559ed1206d12ccaa3ad045e.tar.bz2
[X25]: proper prototype for x25_init_timers()
This patch adds a proper prototype for x25_init_timers() in include/net/x25.h Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/x25.h1
-rw-r--r--net/x25/af_x25.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/net/x25.h b/include/net/x25.h
index 0ad90eb..e47fe44 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -259,6 +259,7 @@ extern int x25_decode(struct sock *, struct sk_buff *, int *, int *, int *, int
extern void x25_disconnect(struct sock *, int, unsigned char, unsigned char);
/* x25_timer.c */
+extern void x25_init_timers(struct sock *sk);
extern void x25_start_heartbeat(struct sock *);
extern void x25_start_t2timer(struct sock *);
extern void x25_start_t21timer(struct sock *);
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 52a2726..b5c80b1 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -484,8 +484,6 @@ out:
return sk;
}
-void x25_init_timers(struct sock *sk);
-
static int x25_create(struct socket *sock, int protocol)
{
struct sock *sk;