* [2.6 patch] proper prototype for x25_init_timers()
@ 2007-01-03 23:09 Adrian Bunk
2007-01-04 2:49 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2007-01-03 23:09 UTC (permalink / raw)
To: netdev, eis; +Cc: linux-kernel, linux-x25
This patch adds a proper prototype for x25_init_timers() in
include/net/x25.h
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
include/net/x25.h | 1 +
net/x25/af_x25.c | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
--- linux-2.6.20-rc2-mm1/include/net/x25.h.old 2007-01-03 22:57:52.000000000 +0100
+++ linux-2.6.20-rc2-mm1/include/net/x25.h 2007-01-03 22:58:17.000000000 +0100
@@ -259,6 +259,7 @@
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 *);
--- linux-2.6.20-rc2-mm1/net/x25/af_x25.c.old 2007-01-03 22:58:28.000000000 +0100
+++ linux-2.6.20-rc2-mm1/net/x25/af_x25.c 2007-01-03 22:58:35.000000000 +0100
@@ -484,8 +484,6 @@
return sk;
}
-void x25_init_timers(struct sock *sk);
-
static int x25_create(struct socket *sock, int protocol)
{
struct sock *sk;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [2.6 patch] proper prototype for x25_init_timers()
2007-01-03 23:09 [2.6 patch] proper prototype for x25_init_timers() Adrian Bunk
@ 2007-01-04 2:49 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-01-04 2:49 UTC (permalink / raw)
To: bunk; +Cc: netdev, eis, linux-kernel, linux-x25
From: Adrian Bunk <bunk@stusta.de>
Date: Thu, 4 Jan 2007 00:09:28 +0100
> This patch adds a proper prototype for x25_init_timers() in
> include/net/x25.h
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Applied, thanks Adrian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-01-04 2:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-03 23:09 [2.6 patch] proper prototype for x25_init_timers() Adrian Bunk
2007-01-04 2:49 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).