From c8ebfc888f9ee93f2dc7cd62b3be66263755d99a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 4 Feb 2002 17:57:11 -0800 Subject: v2.4.1.2 -> v2.4.1.3 - Jens: better ordering of requests when unable to merge - Neil Brown: make md work as a module again (we cannot autodetect in modules, not enough background information) - Neil Brown: raid5 SMP locking cleanups - Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and dentry leak fix - maestro3 shutdown fix - fix dcache hash calculation that could cause bad hashes under certain circumstances (Dean Gaudet) - David Miller: networking and sparc updates - Jeff Garzik: include file cleanups - Andy Grover: ACPI update - Coda-fs error return fixes - rth: alpha Jensen update --- net/lapb/lapb_iface.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'net/lapb/lapb_iface.c') diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index 1723588da48d..aad566564000 100644 --- a/net/lapb/lapb_iface.c +++ b/net/lapb/lapb_iface.c @@ -16,7 +16,6 @@ */ #include -#if defined(CONFIG_LAPB) || defined(CONFIG_LAPB_MODULE) #include #include #include @@ -41,7 +40,7 @@ #include #include -static lapb_cb *volatile lapb_list = NULL; +static lapb_cb *volatile lapb_list /* = NULL initially */; /* * Free an allocated lapb control block. This is done to centralise @@ -271,7 +270,7 @@ int lapb_connect_request(void *token) return LAPB_OK; } - + int lapb_disconnect_request(void *token) { lapb_cb *lapb; @@ -399,18 +398,15 @@ EXPORT_SYMBOL(lapb_disconnect_request); EXPORT_SYMBOL(lapb_data_request); EXPORT_SYMBOL(lapb_data_received); +static const char banner[] __initdata = KERN_INFO "NET4: LAPB for Linux. Version 0.01 for NET4.0\n"; + static int __init lapb_init(void) { - printk(KERN_INFO "NET4: LAPB for Linux. Version 0.01 for NET4.0\n"); + printk(banner); return 0; } -#ifdef MODULE MODULE_AUTHOR("Jonathan Naylor "); MODULE_DESCRIPTION("The X.25 Link Access Procedure B link layer protocol"); -#endif - module_init(lapb_init); - -#endif -- cgit v1.2.3