This patch adds proper prototypes for some functions in
include/net/irda/irda.h
Signed-off-by: Adrian Bunk <[email protected]>
---
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
*/
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 <[email protected]>
looks good to me, thanks.
Signed-off-by: Samuel Ortiz <[email protected]>
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
> */
>
From: Adrian Bunk <[email protected]>
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 <[email protected]>
...
> +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.
On Tue, Jan 02, 2007 at 12:39:53AM -0800, David Miller wrote:
> From: Adrian Bunk <[email protected]>
> 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 <[email protected]>
> ...
> > +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
From: Adrian Bunk <[email protected]>
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.