From: Hans Grobler (tjck@hanze.nl)
Date: Sun Dec 17 2000 - 08:29:09 EET
af_netrom.c-2.4.0-test13-pre2-patch-v1:
- CONFIG_NETROM, CONFIG_NETROM_MODULE:
removed unnecessary conditionals (the Makefiles handle this)
- nr_list:
removed explicit initialization as per linux 2.4
- nr_proto_init, nr_exit:
removed conditionals for PROC_FS as the PROC_FS headers do
the right thing if PROC_FS is not selected.
- nr_proto_init:
update kernel version number in signon banner
- nr_exit:
marked as exit code as per linux 2.4
diff -u3Nr -X dontdiff linux-2.4.0-test13-pre2.orig/net/netrom/af_netrom.c linux-2.4.0-test13-pre2/net/netrom/af_netrom.c
--- linux-2.4.0-test13-pre2.orig/net/netrom/af_netrom.c Mon Oct 16 21:42:54 2000
+++ linux-2.4.0-test13-pre2/net/netrom/af_netrom.c Sun Dec 17 08:14:46 2000
@@ -34,7 +34,6 @@
*/
#include <linux/config.h>
-#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE)
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/types.h>
@@ -82,7 +81,7 @@
static unsigned short circuit = 0x101;
-static struct sock *volatile nr_list = NULL;
+static struct sock *volatile nr_list;
static struct proto_ops nr_proto_ops;
@@ -1280,7 +1279,7 @@
sock_register(&nr_family_ops);
register_netdevice_notifier(&nr_dev_notifier);
- printk(KERN_INFO "G4KLX NET/ROM for Linux. Version 0.7 for AX25.037 Linux 2.1\n");
+ printk(KERN_INFO "G4KLX NET/ROM for Linux. Version 0.7 for AX25.037 Linux 2.4\n");
ax25_protocol_register(AX25_P_NETROM, nr_route_frame);
ax25_linkfail_register(nr_link_failed);
@@ -1291,18 +1290,15 @@
nr_loopback_init();
-#ifdef CONFIG_PROC_FS
proc_net_create("nr", 0, nr_get_info);
proc_net_create("nr_neigh", 0, nr_neigh_get_info);
proc_net_create("nr_nodes", 0, nr_nodes_get_info);
-#endif
return 0;
}
module_init(nr_proto_init);
-#ifdef MODULE
EXPORT_NO_SYMBOLS;
MODULE_PARM(nr_ndevs, "i");
@@ -1311,15 +1307,13 @@
MODULE_AUTHOR("Jonathan Naylor G4KLX <ujfwkfrd.rgwaiioxl@kentwoodps.org>");
MODULE_DESCRIPTION("The amateur radio NET/ROM network and transport layer protocol");
-static void nr_exit(void)
+static void __exit nr_exit(void)
{
int i;
-#ifdef CONFIG_PROC_FS
proc_net_remove("nr");
proc_net_remove("nr_neigh");
proc_net_remove("nr_nodes");
-#endif
nr_loopback_clear();
nr_rt_free();
@@ -1346,8 +1340,3 @@
kfree(dev_nr);
}
module_exit(nr_exit);
-#endif /* MODULE */
-
-
-
-#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-hams" in
the body of a message to zksqog@flexabit.net
This archive was generated by hypermail 2b30 : Sun Dec 17 2000 - 08:40:56 EET