[PATCH] 2.4.4-ac3 +IPX -SYSCTL compile fix

[PATCH] 2.4.4-ac3 +IPX -SYSCTL compile fix

[Pavel Roskin]

Hello!

File net/ipx/sysctl_net_ipx.c provides dummy functions for
ipx_register_sysctl and ipx_unregister_sysctl if CONFIG_SYSCTL is not
defined. The problem is, sysctl_net_ipx.c is not even compiled in this
case.

I'm moving the dummy functions to af_ipx.c where they are used. Not sure
about conformance with the coding standards, but I think that "static
inline" is preferred over defines. Feel free to correct me.

The patch is also here:
http://www.red-bean.com/~proski/linux/ipxsysctl.diff

The patch has been tested. IPX works fine without SYSCTL.

Regards,
Pavel Roskin

----------------------------------------------
--- linux.orig/net/ipx/af_ipx.c
+++ linux/net/ipx/af_ipx.c
@@ -116,8 +116,18 @@
 #include <linux/init.h>
 #include <linux/if_arp.h>

+#ifdef CONFIG_SYSCTL
 extern void ipx_register_sysctl(void);
 extern void ipx_unregister_sysctl(void);
+#else
+static inline void ipx_register_sysctl(void)
+{
+}
+
+static inline void ipx_unregister_sysctl(void)
+{
+}
+#endif

 /* Configuration Variables */
 static unsigned char ipxcfg_max_hops = 16;
--- linux.orig/net/ipx/sysctl_net_ipx.c
+++ linux/net/ipx/sysctl_net_ipx.c
@@ -44,11 +44,5 @@ void ipx_unregister_sysctl(void)
 }

 #else
-void ipx_register_sysctl(void)
-{
-}
-
-void ipx_unregister_sysctl(void)
-{
-}
+#error This file shouldn't be compiled without CONFIG_SYSCTL defined
 #endif

Re: [PATCH] 2.4.4-ac3 +IPX -SYSCTL compile fix

[Pavel Roskin]

> +#error This file shouldn't be compiled without CONFIG_SYSCTL defined

Oops, sorry! Unterminated string constant in preprocessor. It should be

#error This file should not be compiled without CONFIG_SYSCTL defined

The patch at http://www.red-bean.com/~proski/linux/ipxsysctl.diff has been
updated.

-- 
Regards,
Pavel Roskin

Re: [PATCH] 2.4.4-ac3 +IPX -SYSCTL compile fix

[Arnaldo Carvalho de Melo]

Em Wed, May 02, 2001 at 11:17:22AM -0400, Pavel Roskin escreveu:
> > +#error This file shouldn't be compiled without CONFIG_SYSCTL defined
> 
> Oops, sorry! Unterminated string constant in preprocessor. It should be
> 
> #error This file should not be compiled without CONFIG_SYSCTL defined
> 
> The patch at http://www.red-bean.com/~proski/linux/ipxsysctl.diff has been
> updated.

ok, I'm looking at this and including in the patch I'm about to send.

- Arnaldo