From 06615f62b17d7de6e12d2f5ec6b88cf30af08413 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 23 Nov 2000 02:00:47 +0000 Subject: Merge with Linux 2.4.0-test10. --- net/ax25/Config.in | 2 +- net/ax25/af_ax25.c | 22 +++++++++++----------- net/ax25/ax25_ds_in.c | 6 ++---- 3 files changed, 14 insertions(+), 16 deletions(-) (limited to 'net/ax25') diff --git a/net/ax25/Config.in b/net/ax25/Config.in index 2670528b3..b8e5d7333 100644 --- a/net/ax25/Config.in +++ b/net/ax25/Config.in @@ -3,7 +3,7 @@ # # 19971130 Now in an own category to make correct compilation of the # AX.25 stuff easier... -# Joerg Reuter DL1BKE +# Joerg Reuter DL1BKE # 19980129 Moved to net/ax25/Config.in, sourcing device drivers. mainmenu_option next_comment diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index fc8910f2d..8e34e42e2 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -101,6 +101,7 @@ * ax25_connect() and ax25_sendmsg() * Joerg(DL1BKE) Added support for SO_BINDTODEVICE * Arnaldo C. Melo s/suser/capable(CAP_NET_ADMIN)/, some more cleanups + * Michal Ostrowski Module initialization cleanup. */ #include @@ -137,6 +138,8 @@ #include #include + + ax25_cb *volatile ax25_list = NULL; static struct proto_ops ax25_proto_ops; @@ -1193,7 +1196,7 @@ static int ax25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le */ if (sk->zapped) { /* check if we can remove this feature. It is broken. */ - printk(KERN_WARNING "ax25_connect(): %s uses autobind, please contact jreuter@poboxes.com\n", + printk(KERN_WARNING "ax25_connect(): %s uses autobind, please contact jreuter@yaina.de\n", current->comm); if ((err = ax25_rt_autobind(sk->protinfo.ax25, &fsa->fsa_ax25.sax25_call)) < 0) return err; @@ -1844,7 +1847,7 @@ EXPORT_SYMBOL(asc2ax); EXPORT_SYMBOL(null_ax25_address); EXPORT_SYMBOL(ax25_display_timer); -void __init ax25_proto_init(struct net_proto *pro) +static int __init ax25_init(void) { sock_register(&ax25_family_ops); ax25_packet_type.type = htons(ETH_P_AX25); @@ -1861,20 +1864,16 @@ void __init ax25_proto_init(struct net_proto *pro) #endif printk(KERN_INFO "NET4: G4KLX/GW4PTS AX.25 for Linux. Version 0.37 for Linux NET4.0\n"); + return 0; } +module_init(ax25_init); + #ifdef MODULE MODULE_AUTHOR("Jonathan Naylor G4KLX "); MODULE_DESCRIPTION("The amateur radio AX.25 link layer protocol"); -int init_module(void) -{ - ax25_proto_init(NULL); - - return 0; -} - -void cleanup_module(void) +static void __exit ax25_exit(void) { #ifdef CONFIG_PROC_FS proc_net_remove("ax25_route"); @@ -1895,6 +1894,7 @@ void cleanup_module(void) sock_unregister(PF_AX25); } -#endif +module_exit(ax25_exit); +#endif /* MODULE */ #endif diff --git a/net/ax25/ax25_ds_in.c b/net/ax25/ax25_ds_in.c index 464122823..3354206df 100644 --- a/net/ax25/ax25_ds_in.c +++ b/net/ax25/ax25_ds_in.c @@ -89,10 +89,8 @@ static int ax25_ds_state1_machine(ax25_cb *ax25, struct sk_buff *skb, int framet ax25_dama_on(ax25); /* according to DK4EG´s spec we are required to - * send a RR RESPONSE FINAL NR=0. Please mail - * if this causes problems - * with the TheNetNode DAMA Master implementation. - */ + * send a RR RESPONSE FINAL NR=0. + */ ax25_std_enquiry_response(ax25); break; -- cgit v1.2.3