* [2.6 patch] net/irda/: proper prototypes
@ 2006-12-18 3:46 Adrian Bunk
2006-12-19 22:29 ` Samuel Ortiz
2007-01-02 8:39 ` David Miller
0 siblings, 2 replies; 7+ messages in thread
From: Adrian Bunk @ 2006-12-18 3:46 UTC (permalink / raw)
To: samuel; +Cc: netdev, linux-kernel
This patch adds proper prototypes for some functions in
include/net/irda/irda.h
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
include/net/irda/irda.h | 15 +++++++++++++++
net/irda/irmod.c | 13 -------------
2 files changed, 15 insertions(+), 13 deletions(-)
--- linux-2.6.20-rc1-mm1/include/net/irda/irda.h.old 2006-12-18 02:49:02.000000000 +0100
+++ linux-2.6.20-rc1-mm1/include/net/irda/irda.h 2006-12-18 02:58:02.000000000 +0100
@@ -113,4 +113,19 @@
#define IAS_IRCOMM_ID 0x2343
#define IAS_IRLPT_ID 0x9876
+struct net_device;
+struct packet_type;
+
+void irda_proc_register(void);
+void irda_proc_unregister(void);
+
+int irda_sysctl_register(void);
+void irda_sysctl_unregister(void);
+
+int irsock_init(void);
+void irsock_cleanup(void);
+
+int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
+ struct packet_type *ptype, struct net_device *orig_dev);
+
#endif /* NET_IRDA_H */
--- linux-2.6.20-rc1-mm1/net/irda/irmod.c.old 2006-12-18 02:52:18.000000000 +0100
+++ linux-2.6.20-rc1-mm1/net/irda/irmod.c 2006-12-18 02:53:59.000000000 +0100
@@ -42,19 +42,6 @@
#include <net/irda/irttp.h> /* irttp_init */
#include <net/irda/irda_device.h> /* irda_device_init */
-/* irproc.c */
-extern void irda_proc_register(void);
-extern void irda_proc_unregister(void);
-/* irsysctl.c */
-extern int irda_sysctl_register(void);
-extern void irda_sysctl_unregister(void);
-/* af_irda.c */
-extern int irsock_init(void);
-extern void irsock_cleanup(void);
-/* irlap_frame.c */
-extern int irlap_driver_rcv(struct sk_buff *, struct net_device *,
- struct packet_type *, struct net_device *);
-
/*
* Module parameters
*/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] net/irda/: proper prototypes
2006-12-18 3:46 [2.6 patch] net/irda/: proper prototypes Adrian Bunk
@ 2006-12-19 22:29 ` Samuel Ortiz
2007-01-02 8:39 ` David Miller
1 sibling, 0 replies; 7+ messages in thread
From: Samuel Ortiz @ 2006-12-19 22:29 UTC (permalink / raw)
To: Adrian Bunk; +Cc: netdev, linux-kernel, David S. Miller
Hi Adrian,
On Mon, Dec 18, 2006 at 04:46:26AM +0100, Adrian Bunk wrote:
> This patch adds proper prototypes for some functions in
> include/net/irda/irda.h
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
looks good to me, thanks.
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Cheers,
Samuel.
>
> ---
>
> include/net/irda/irda.h | 15 +++++++++++++++
> net/irda/irmod.c | 13 -------------
> 2 files changed, 15 insertions(+), 13 deletions(-)
>
> --- linux-2.6.20-rc1-mm1/include/net/irda/irda.h.old 2006-12-18 02:49:02.000000000 +0100
> +++ linux-2.6.20-rc1-mm1/include/net/irda/irda.h 2006-12-18 02:58:02.000000000 +0100
> @@ -113,4 +113,19 @@
> #define IAS_IRCOMM_ID 0x2343
> #define IAS_IRLPT_ID 0x9876
>
> +struct net_device;
> +struct packet_type;
> +
> +void irda_proc_register(void);
> +void irda_proc_unregister(void);
> +
> +int irda_sysctl_register(void);
> +void irda_sysctl_unregister(void);
> +
> +int irsock_init(void);
> +void irsock_cleanup(void);
> +
> +int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
> + struct packet_type *ptype, struct net_device *orig_dev);
> +
> #endif /* NET_IRDA_H */
> --- linux-2.6.20-rc1-mm1/net/irda/irmod.c.old 2006-12-18 02:52:18.000000000 +0100
> +++ linux-2.6.20-rc1-mm1/net/irda/irmod.c 2006-12-18 02:53:59.000000000 +0100
> @@ -42,19 +42,6 @@
> #include <net/irda/irttp.h> /* irttp_init */
> #include <net/irda/irda_device.h> /* irda_device_init */
>
> -/* irproc.c */
> -extern void irda_proc_register(void);
> -extern void irda_proc_unregister(void);
> -/* irsysctl.c */
> -extern int irda_sysctl_register(void);
> -extern void irda_sysctl_unregister(void);
> -/* af_irda.c */
> -extern int irsock_init(void);
> -extern void irsock_cleanup(void);
> -/* irlap_frame.c */
> -extern int irlap_driver_rcv(struct sk_buff *, struct net_device *,
> - struct packet_type *, struct net_device *);
> -
> /*
> * Module parameters
> */
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] net/irda/: proper prototypes
2006-12-18 3:46 [2.6 patch] net/irda/: proper prototypes Adrian Bunk
2006-12-19 22:29 ` Samuel Ortiz
@ 2007-01-02 8:39 ` David Miller
2007-01-02 12:45 ` Adrian Bunk
1 sibling, 1 reply; 7+ messages in thread
From: David Miller @ 2007-01-02 8:39 UTC (permalink / raw)
To: bunk; +Cc: samuel, netdev, linux-kernel
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 18 Dec 2006 04:46:26 +0100
> This patch adds proper prototypes for some functions in
> include/net/irda/irda.h
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
...
> +struct net_device;
> +struct packet_type;
> +
> +void irda_proc_register(void);
> +void irda_proc_unregister(void);
> +
> +int irda_sysctl_register(void);
> +void irda_sysctl_unregister(void);
> +
> +int irsock_init(void);
> +void irsock_cleanup(void);
> +
> +int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
> + struct packet_type *ptype, struct net_device *orig_dev);
Remind me why you remove the "extern" from "external" function
declarations all the time?
I don't like it, even if it's "correct", because it is inconsistent
with what we do in the entire rest of the networking code.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] net/irda/: proper prototypes
2007-01-02 8:39 ` David Miller
@ 2007-01-02 12:45 ` Adrian Bunk
2007-01-02 21:02 ` David Miller
0 siblings, 1 reply; 7+ messages in thread
From: Adrian Bunk @ 2007-01-02 12:45 UTC (permalink / raw)
To: David Miller; +Cc: samuel, netdev, linux-kernel
On Tue, Jan 02, 2007 at 12:39:53AM -0800, David Miller wrote:
> From: Adrian Bunk <bunk@stusta.de>
> Date: Mon, 18 Dec 2006 04:46:26 +0100
>
> > This patch adds proper prototypes for some functions in
> > include/net/irda/irda.h
> >
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> ...
> > +struct net_device;
> > +struct packet_type;
> > +
> > +void irda_proc_register(void);
> > +void irda_proc_unregister(void);
> > +
> > +int irda_sysctl_register(void);
> > +void irda_sysctl_unregister(void);
> > +
> > +int irsock_init(void);
> > +void irsock_cleanup(void);
> > +
> > +int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
> > + struct packet_type *ptype, struct net_device *orig_dev);
>
> Remind me why you remove the "extern" from "external" function
> declarations all the time?
It's shorter, letting more contents fit into one line.
> I don't like it, even if it's "correct", because it is inconsistent
> with what we do in the entire rest of the networking code.
Good point.
Is it OK to slowly starting converting them or do you want them to stay?
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [2.6 patch] net/irda/: proper prototypes
2007-01-02 12:45 ` Adrian Bunk
@ 2007-01-02 21:02 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2007-01-02 21:02 UTC (permalink / raw)
To: bunk; +Cc: samuel, netdev, linux-kernel
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 2 Jan 2007 13:45:57 +0100
> On Tue, Jan 02, 2007 at 12:39:53AM -0800, David Miller wrote:
> > I don't like it, even if it's "correct", because it is inconsistent
> > with what we do in the entire rest of the networking code.
>
> Good point.
>
> Is it OK to slowly starting converting them or do you want them to stay?
If I saw some value in it I'd say to convert, but I don't so
I'd say let's keep them the way they are.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [patch 02/11] net/irda/: proper prototypes
@ 2007-02-06 0:30 akpm
2007-02-06 2:01 ` David Miller
0 siblings, 1 reply; 7+ messages in thread
From: akpm @ 2007-02-06 0:30 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, bunk, samuel
From: Adrian Bunk <bunk@stusta.de>
Add proper prototypes for some functions in include/net/irda/irda.h
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/net/irda/irda.h | 15 +++++++++++++++
net/irda/irmod.c | 13 -------------
2 files changed, 15 insertions(+), 13 deletions(-)
diff -puN include/net/irda/irda.h~net-irda-proper-prototypes include/net/irda/irda.h
--- a/include/net/irda/irda.h~net-irda-proper-prototypes
+++ a/include/net/irda/irda.h
@@ -113,4 +113,19 @@ do { if(!(expr)) { \
#define IAS_IRCOMM_ID 0x2343
#define IAS_IRLPT_ID 0x9876
+struct net_device;
+struct packet_type;
+
+void irda_proc_register(void);
+void irda_proc_unregister(void);
+
+int irda_sysctl_register(void);
+void irda_sysctl_unregister(void);
+
+int irsock_init(void);
+void irsock_cleanup(void);
+
+int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
+ struct packet_type *ptype, struct net_device *orig_dev);
+
#endif /* NET_IRDA_H */
diff -puN net/irda/irmod.c~net-irda-proper-prototypes net/irda/irmod.c
--- a/net/irda/irmod.c~net-irda-proper-prototypes
+++ a/net/irda/irmod.c
@@ -42,19 +42,6 @@
#include <net/irda/irttp.h> /* irttp_init */
#include <net/irda/irda_device.h> /* irda_device_init */
-/* irproc.c */
-extern void irda_proc_register(void);
-extern void irda_proc_unregister(void);
-/* irsysctl.c */
-extern int irda_sysctl_register(void);
-extern void irda_sysctl_unregister(void);
-/* af_irda.c */
-extern int irsock_init(void);
-extern void irsock_cleanup(void);
-/* irlap_frame.c */
-extern int irlap_driver_rcv(struct sk_buff *, struct net_device *,
- struct packet_type *, struct net_device *);
-
/*
* Module parameters
*/
_
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch 02/11] net/irda/: proper prototypes
2007-02-06 0:30 [patch 02/11] " akpm
@ 2007-02-06 2:01 ` David Miller
2007-02-20 0:07 ` [2.6 patch] " Adrian Bunk
0 siblings, 1 reply; 7+ messages in thread
From: David Miller @ 2007-02-06 2:01 UTC (permalink / raw)
To: akpm; +Cc: netdev, bunk, samuel
From: akpm@linux-foundation.org
Date: Mon, 05 Feb 2007 16:30:53 -0800
> From: Adrian Bunk <bunk@stusta.de>
>
> Add proper prototypes for some functions in include/net/irda/irda.h
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> Acked-by: Samuel Ortiz <samuel@sortiz.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
I NAK'd this so that Adrian would go add "extern" to the
function declarations in the header file.
Please drop this, Adrian will resend once he fixes it up.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [2.6 patch] net/irda/: proper prototypes
2007-02-06 2:01 ` David Miller
@ 2007-02-20 0:07 ` Adrian Bunk
2007-02-20 9:05 ` David Miller
0 siblings, 1 reply; 7+ messages in thread
From: Adrian Bunk @ 2007-02-20 0:07 UTC (permalink / raw)
To: David Miller; +Cc: akpm, netdev, samuel
On Mon, Feb 05, 2007 at 06:01:42PM -0800, David Miller wrote:
> From: akpm@linux-foundation.org
> Date: Mon, 05 Feb 2007 16:30:53 -0800
>
> > From: Adrian Bunk <bunk@stusta.de>
> >
> > Add proper prototypes for some functions in include/net/irda/irda.h
> >
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> > Acked-by: Samuel Ortiz <samuel@sortiz.org>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>
> I NAK'd this so that Adrian would go add "extern" to the
> function declarations in the header file.
>
> Please drop this, Adrian will resend once he fixes it up.
Sorry, I should have sent this earlier.
Updated patch below.
cu
Adrian
<-- snip -->
This patch adds proper prototypes for some functions in
include/net/irda/irda.h
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
include/net/irda/irda.h | 16 ++++++++++++++++
net/irda/irmod.c | 13 -------------
2 files changed, 16 insertions(+), 13 deletions(-)
--- linux-2.6.20-rc1-mm1/include/net/irda/irda.h.old 2006-12-18 02:49:02.000000000 +0100
+++ linux-2.6.20-rc1-mm1/include/net/irda/irda.h 2006-12-18 02:58:02.000000000 +0100
@@ -113,4 +113,20 @@
#define IAS_IRCOMM_ID 0x2343
#define IAS_IRLPT_ID 0x9876
+struct net_device;
+struct packet_type;
+
+extern void irda_proc_register(void);
+extern void irda_proc_unregister(void);
+
+extern int irda_sysctl_register(void);
+extern void irda_sysctl_unregister(void);
+
+extern int irsock_init(void);
+extern void irsock_cleanup(void);
+
+extern int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
+ struct packet_type *ptype,
+ struct net_device *orig_dev);
+
#endif /* NET_IRDA_H */
--- linux-2.6.20-rc1-mm1/net/irda/irmod.c.old 2006-12-18 02:52:18.000000000 +0100
+++ linux-2.6.20-rc1-mm1/net/irda/irmod.c 2006-12-18 02:53:59.000000000 +0100
@@ -42,19 +42,6 @@
#include <net/irda/irttp.h> /* irttp_init */
#include <net/irda/irda_device.h> /* irda_device_init */
-/* irproc.c */
-extern void irda_proc_register(void);
-extern void irda_proc_unregister(void);
-/* irsysctl.c */
-extern int irda_sysctl_register(void);
-extern void irda_sysctl_unregister(void);
-/* af_irda.c */
-extern int irsock_init(void);
-extern void irsock_cleanup(void);
-/* irlap_frame.c */
-extern int irlap_driver_rcv(struct sk_buff *, struct net_device *,
- struct packet_type *, struct net_device *);
-
/*
* Module parameters
*/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] net/irda/: proper prototypes
2007-02-20 0:07 ` [2.6 patch] " Adrian Bunk
@ 2007-02-20 9:05 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2007-02-20 9:05 UTC (permalink / raw)
To: bunk; +Cc: akpm, netdev, samuel
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 20 Feb 2007 01:07:21 +0100
> On Mon, Feb 05, 2007 at 06:01:42PM -0800, David Miller wrote:
> > From: akpm@linux-foundation.org
> > Date: Mon, 05 Feb 2007 16:30:53 -0800
> >
> > > From: Adrian Bunk <bunk@stusta.de>
> > >
> > > Add proper prototypes for some functions in include/net/irda/irda.h
> > >
> > > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> > > Acked-by: Samuel Ortiz <samuel@sortiz.org>
> > > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> >
> > I NAK'd this so that Adrian would go add "extern" to the
> > function declarations in the header file.
> >
> > Please drop this, Adrian will resend once he fixes it up.
>
> Sorry, I should have sent this earlier.
> Updated patch below.
...
> This patch adds proper prototypes for some functions in
> include/net/irda/irda.h
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Thanks Adrian, applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-02-20 9:05 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-18 3:46 [2.6 patch] net/irda/: proper prototypes Adrian Bunk
2006-12-19 22:29 ` Samuel Ortiz
2007-01-02 8:39 ` David Miller
2007-01-02 12:45 ` Adrian Bunk
2007-01-02 21:02 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2007-02-06 0:30 [patch 02/11] " akpm
2007-02-06 2:01 ` David Miller
2007-02-20 0:07 ` [2.6 patch] " Adrian Bunk
2007-02-20 9:05 ` 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).