From: Hans Grobler (naep.eiruyi@secondstory.com)
Date: Sun Dec 17 2000 - 08:38:49 EET
af_ax25.c-2.4.0-test13-pre2-patch-v1:
- CONFIG_AX25, CONFIG_AX25_MODULE:
removed unnecessary conditionals (the Makefiles handle this)
- ax25_list:
removed explicit initialization as per linux 2.4.
mmm, volatile... inconsisent with other protocols...
- ax25_init, ax25_exit:
removed conditionals for PROC_FS as the PROC_FS headers do
the right thing if PROC_FS is not selected.
diff -u3Nr -X dontdiff linux-2.4.0-test13-pre2.orig/net/ax25/af_ax25.c linux-2.4.0-test13-pre2/net/ax25/af_ax25.c
--- linux-2.4.0-test13-pre2.orig/net/ax25/af_ax25.c Mon Oct 16 21:42:54 2000
+++ linux-2.4.0-test13-pre2/net/ax25/af_ax25.c Sat Dec 16 21:08:45 2000
@@ -105,7 +105,6 @@
*/
#include <linux/config.h>
-#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/types.h>
@@ -140,7 +139,7 @@
-ax25_cb *volatile ax25_list = NULL;
+ax25_cb *volatile ax25_list;
static struct proto_ops ax25_proto_ops;
@@ -1857,11 +1856,9 @@
ax25_register_sysctl();
#endif
-#ifdef CONFIG_PROC_FS
proc_net_create("ax25_route", 0, ax25_rt_get_info);
proc_net_create("ax25", 0, ax25_get_info);
proc_net_create("ax25_calls", 0, ax25_uid_get_info);
-#endif
printk(KERN_INFO "NET4: G4KLX/GW4PTS AX.25 for Linux. Version 0.37 for Linux NET4.0\n");
return 0;
@@ -1869,17 +1866,14 @@
module_init(ax25_init);
-#ifdef MODULE
MODULE_AUTHOR("Jonathan Naylor G4KLX <ncdp.qvwecq@peoples.com>");
MODULE_DESCRIPTION("The amateur radio AX.25 link layer protocol");
static void __exit ax25_exit(void)
{
-#ifdef CONFIG_PROC_FS
proc_net_remove("ax25_route");
proc_net_remove("ax25");
proc_net_remove("ax25_calls");
-#endif
ax25_rt_free();
ax25_uid_free();
ax25_dev_free();
@@ -1895,6 +1889,3 @@
sock_unregister(PF_AX25);
}
module_exit(ax25_exit);
-#endif /* MODULE */
-
-#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-hams" in
the body of a message to ilmyuxvg@ally.com
This archive was generated by hypermail 2b30 : Sun Dec 17 2000 - 08:40:57 EET