aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1998-10-31 20:07:01 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1998-10-31 20:07:01 +0000
commit264b85f3ced8854f80cc5273e29dbb87e8cbafee (patch)
treebef5a1e72f31a30f0e44cf1032aaaf8c6c48d332
parent9fddf73ad02abd42983850115f2ac3375ed5be6f (diff)
Trivial stylish changes, mostly to silence gcc.
Reviewed by: Mike Spengler <mks@networkcs.com> Submitted by: phk
Notes
Notes: svn path=/head/; revision=40799
-rw-r--r--sys/dev/hea/eni.c10
-rw-r--r--sys/dev/hea/eni_buffer.c10
-rw-r--r--sys/dev/hea/eni_globals.c10
-rw-r--r--sys/dev/hea/eni_if.c10
-rw-r--r--sys/dev/hea/eni_init.c10
-rw-r--r--sys/dev/hea/eni_intr.c10
-rw-r--r--sys/dev/hea/eni_receive.c10
-rw-r--r--sys/dev/hea/eni_transmit.c10
-rw-r--r--sys/dev/hea/eni_vcm.c10
-rw-r--r--sys/dev/hfa/fore_buffer.c8
-rw-r--r--sys/dev/hfa/fore_command.c8
-rw-r--r--sys/dev/hfa/fore_globals.c8
-rw-r--r--sys/dev/hfa/fore_if.c8
-rw-r--r--sys/dev/hfa/fore_init.c8
-rw-r--r--sys/dev/hfa/fore_intr.c8
-rw-r--r--sys/dev/hfa/fore_load.c18
-rw-r--r--sys/dev/hfa/fore_output.c8
-rw-r--r--sys/dev/hfa/fore_receive.c8
-rw-r--r--sys/dev/hfa/fore_stats.c8
-rw-r--r--sys/dev/hfa/fore_timer.c8
-rw-r--r--sys/dev/hfa/fore_transmit.c8
-rw-r--r--sys/dev/hfa/fore_vcm.c8
-rw-r--r--sys/netatm/atm_aal5.c20
-rw-r--r--sys/netatm/atm_cm.c8
-rw-r--r--sys/netatm/atm_device.c8
-rw-r--r--sys/netatm/atm_if.c8
-rw-r--r--sys/netatm/atm_proto.c8
-rw-r--r--sys/netatm/atm_signal.c8
-rw-r--r--sys/netatm/atm_socket.c8
-rw-r--r--sys/netatm/atm_subr.c8
-rw-r--r--sys/netatm/atm_usrreq.c12
-rw-r--r--sys/netatm/ipatm/ipatm_event.c10
-rw-r--r--sys/netatm/ipatm/ipatm_if.c10
-rw-r--r--sys/netatm/ipatm/ipatm_input.c15
-rw-r--r--sys/netatm/ipatm/ipatm_load.c10
-rw-r--r--sys/netatm/ipatm/ipatm_output.c10
-rw-r--r--sys/netatm/ipatm/ipatm_usrreq.c10
-rw-r--r--sys/netatm/ipatm/ipatm_vcm.c10
-rw-r--r--sys/netatm/sigpvc/sigpvc_if.c10
-rw-r--r--sys/netatm/sigpvc/sigpvc_subr.c10
-rw-r--r--sys/netatm/spans/spans_arp.c10
-rw-r--r--sys/netatm/spans/spans_cls.c10
-rw-r--r--sys/netatm/spans/spans_if.c10
-rw-r--r--sys/netatm/spans/spans_kxdr.c8
-rw-r--r--sys/netatm/spans/spans_msg.c10
-rw-r--r--sys/netatm/spans/spans_print.c30
-rw-r--r--sys/netatm/spans/spans_proto.c10
-rw-r--r--sys/netatm/spans/spans_subr.c10
-rw-r--r--sys/netatm/spans/spans_util.c10
-rw-r--r--sys/netatm/uni/q2110_sigaa.c10
-rw-r--r--sys/netatm/uni/q2110_sigcpcs.c10
-rw-r--r--sys/netatm/uni/q2110_subr.c10
-rw-r--r--sys/netatm/uni/qsaal1_sigaa.c10
-rw-r--r--sys/netatm/uni/qsaal1_sigcpcs.c10
-rw-r--r--sys/netatm/uni/qsaal1_subr.c10
-rw-r--r--sys/netatm/uni/sscf_uni.c10
-rw-r--r--sys/netatm/uni/sscf_uni_lower.c10
-rw-r--r--sys/netatm/uni/sscf_uni_upper.c10
-rw-r--r--sys/netatm/uni/sscop.c11
-rw-r--r--sys/netatm/uni/sscop_lower.c10
-rw-r--r--sys/netatm/uni/sscop_pdu.c10
-rw-r--r--sys/netatm/uni/sscop_sigaa.c10
-rw-r--r--sys/netatm/uni/sscop_sigcpcs.c10
-rw-r--r--sys/netatm/uni/sscop_subr.c10
-rw-r--r--sys/netatm/uni/sscop_timer.c10
-rw-r--r--sys/netatm/uni/sscop_upper.c10
-rw-r--r--sys/netatm/uni/uni_load.c10
-rw-r--r--sys/netatm/uni/uniarp.c11
-rw-r--r--sys/netatm/uni/uniarp_cache.c10
-rw-r--r--sys/netatm/uni/uniarp_input.c11
-rw-r--r--sys/netatm/uni/uniarp_output.c10
-rw-r--r--sys/netatm/uni/uniarp_timer.c10
-rw-r--r--sys/netatm/uni/uniarp_vcm.c10
-rw-r--r--sys/netatm/uni/uniip.c10
-rw-r--r--sys/netatm/uni/unisig_decode.c10
-rw-r--r--sys/netatm/uni/unisig_encode.c10
-rw-r--r--sys/netatm/uni/unisig_if.c10
-rw-r--r--sys/netatm/uni/unisig_mbuf.c10
-rw-r--r--sys/netatm/uni/unisig_msg.c10
-rw-r--r--sys/netatm/uni/unisig_print.c10
-rw-r--r--sys/netatm/uni/unisig_proto.c10
-rw-r--r--sys/netatm/uni/unisig_sigmgr_state.c10
-rw-r--r--sys/netatm/uni/unisig_subr.c10
-rw-r--r--sys/netatm/uni/unisig_util.c10
-rw-r--r--sys/netatm/uni/unisig_vc_state.c10
85 files changed, 434 insertions, 424 deletions
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 977ed9bf2060..17427e9105bd 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $
+ * @(#) $Id: eni.c,v 1.2 1998/09/17 09:34:58 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <dev/hea/eni_stats.h>
#include <dev/hea/eni.h>
#include <dev/hea/eni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: eni.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+#endif
+
/*
* Typedef local functions
*/
diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c
index 35d1b13ae4f8..71d2eb9128ca 100644
--- a/sys/dev/hea/eni_buffer.c
+++ b/sys/dev/hea/eni_buffer.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: eni_buffer.c,v 1.8 1998/08/26 23:28:53 mks Exp $
+ * @(#) $Id: eni_buffer.c,v 1.1 1998/09/15 08:22:53 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_buffer.c,v 1.8 1998/08/26 23:28:53 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <dev/hea/eni_stats.h>
#include <dev/hea/eni.h>
#include <dev/hea/eni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: eni_buffer.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+#endif
+
static int eni_test_memory __P((Eni_unit *));
/*
diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c
index a2a51fa83409..71253e27a823 100644
--- a/sys/dev/hea/eni_globals.c
+++ b/sys/dev/hea/eni_globals.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: eni_globals.c,v 1.2 1997/05/06 22:07:52 mks Exp $
+ * @(#) $Id: eni_globals.c,v 1.1 1998/09/15 08:22:53 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_globals.c,v 1.2 1997/05/06 22:07:52 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <dev/hea/eni_stats.h>
#include <dev/hea/eni.h>
#include <dev/hea/eni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: eni_globals.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+#endif
+
/*
* Device unit table
*/
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 41ffd485b3f1..d2c9ad65a762 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: eni_if.c,v 1.6 1998/08/26 23:28:53 mks Exp $
+ * @(#) $Id: eni_if.c,v 1.1 1998/09/15 08:22:53 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_if.c,v 1.6 1998/08/26 23:28:53 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <dev/hea/eni_stats.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: eni_if.c,v 1.6 1998/08/26 23:28:53 mks Exp $";
#include <dev/hea/eni_suni.h>
#include <dev/hea/eni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: eni_if.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+#endif
+
static void eni_get_stats __P((Eni_unit *));
/*
diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c
index d8106ab0e763..5706c65adb32 100644
--- a/sys/dev/hea/eni_init.c
+++ b/sys/dev/hea/eni_init.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: eni_init.c,v 1.6 1998/08/26 23:28:53 mks Exp $
+ * @(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_init.c,v 1.6 1998/08/26 23:28:53 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <dev/hea/eni_stats.h>
#include <dev/hea/eni.h>
#include <dev/hea/eni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+#endif
+
/*
* Initialize adapter for PDU processing
*
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index 44a6790eb88d..ccc0d6bbc547 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ * @(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <dev/hea/eni_stats.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
#include <dev/hea/eni_suni.h>
#include <dev/hea/eni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+#endif
+
static void eni_suni_intr __P((Eni_unit *));
/*
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 94ce8c48a221..8e8be36d6577 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ * @(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <dev/hea/eni_stats.h>
#include <dev/hea/eni.h>
#include <dev/hea/eni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+#endif
+
static void eni_recv_stack __P((void *, KBuffer *));
#ifdef DIAGNOSTIC
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index 8e9f977edfa3..2721709a8fd6 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: eni_transmit.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ * @(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $
*
*/
@@ -36,16 +36,16 @@
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_transmit.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <dev/hea/eni_stats.h>
#include <dev/hea/eni.h>
#include <dev/hea/eni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $");
+#endif
+
/*
* Make a variable which controls printing of PDUs
* as they travel through the driver.
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index 36c2a3dbcec5..a88fc01bc67a 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: eni_vcm.c,v 1.8 1998/06/29 23:03:18 mks Exp $
+ * @(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $
*
*/
@@ -36,16 +36,16 @@
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: eni_vcm.c,v 1.8 1998/06/29 23:03:18 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <dev/hea/eni_stats.h>
#include <dev/hea/eni.h>
#include <dev/hea/eni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $");
+#endif
+
/*
* VCC Stack Instantiation
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index d8bdce48c6d1..6952f01cc23d 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_buffer.c,v 1.6 1997/05/06 22:09:21 mks Exp $
+ * @(#) $Id: fore_buffer.c,v 1.1 1998/09/15 08:22:54 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_buffer.c,v 1.6 1997/05/06 22:09:21 mks Exp $";
+__RCSID("@(#) $Id: fore_buffer.c,v 1.1 1998/09/15 08:22:54 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Local functions
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index 980be432deaa..c2ed62844a57 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_command.c,v 1.1 1998/09/15 08:22:54 phk Exp $
+ * @(#) $Id: fore_command.c,v 1.2 1998/09/17 09:34:58 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_command.c,v 1.1 1998/09/15 08:22:54 phk Exp $";
+__RCSID("@(#) $Id: fore_command.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Local variables
*/
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index 4abc5fa437c3..5dc803a95417 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_globals.c,v 1.6 1997/05/06 22:09:31 mks Exp $
+ * @(#) $Id: fore_globals.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_globals.c,v 1.6 1997/05/06 22:09:31 mks Exp $";
+__RCSID("@(#) $Id: fore_globals.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Supported device models
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 7d3b3b6dff5f..9c8a82d02744 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_if.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_if.c,v 1.6 1998/08/26 23:28:58 mks Exp $
+ * @(#) $Id: fore_if.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_if.c,v 1.6 1998/08/26 23:28:58 mks Exp $";
+__RCSID("@(#) $Id: fore_if.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Handle netatm core service interface ioctl requests
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index d82a8f8f7a1d..eade984cd20c 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_init.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_init.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ * @(#) $Id: fore_init.c,v 1.2 1998/09/17 09:34:59 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_init.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
+__RCSID("@(#) $Id: fore_init.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Local functions
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index f295b6267e39..6fba5f224a7c 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_intr.c,v 1.7 1997/05/06 22:09:48 mks Exp $
+ * @(#) $Id: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_intr.c,v 1.7 1997/05/06 22:09:48 mks Exp $";
+__RCSID("@(#) $Id: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
#if defined(sun)
/*
* Polling interrupt routine
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index 251443d25247..1d5735de25d2 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_load.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ * @(#) $Id: fore_load.c,v 1.2 1998/09/17 09:34:59 phk Exp $
*
*/
@@ -35,21 +35,21 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_load.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
+__RCSID("@(#) $Id: fore_load.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Local functions
*/
static int fore_start __P((void));
+#ifdef sun
static int fore_stop __P((void));
static int fore_doload __P((void));
static int fore_dounload __P((void));
-#ifdef sun
static int fore_identify __P((char *));
static int fore_attach __P((struct devinfo *));
#endif
@@ -156,6 +156,8 @@ fore_start()
}
+#ifdef sun
+
/*
* Halt driver processing
*
@@ -240,8 +242,6 @@ fore_stop()
return (0);
}
-
-#ifdef sun
/*
* Device identify routine
*
@@ -1143,8 +1143,8 @@ fore_unattach(fup)
struct dev_info *devinfo_p = fup->fu_devinfo;
struct dev_reg *dev_reg_p;
struct dev_intr *dev_intr_p;
-#endif
int i;
+#endif
/*
@@ -1359,6 +1359,7 @@ fore_reset(fup)
*******************************************************************
*/
+#ifdef sun
/*
* Generic module load processing
*
@@ -1418,7 +1419,6 @@ fore_dounload()
}
-#ifdef sun
/*
* Loadable driver description
*/
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index 59c82c939dc3..d92d5a01ca48 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_output.c,v 1.7 1998/02/19 20:10:34 mks Exp $
+ * @(#) $Id: fore_output.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_output.c,v 1.7 1998/02/19 20:10:34 mks Exp $";
+__RCSID("@(#) $Id: fore_output.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Local functions
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index 12dfcec0d69c..431a03f17cba 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_receive.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ * @(#) $Id: fore_receive.c,v 1.2 1998/09/17 09:34:59 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_receive.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
+__RCSID("@(#) $Id: fore_receive.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Local functions
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index c70b09879a7a..c1a1fab14e81 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_stats.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ * @(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_stats.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
+__RCSID("@(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Get device statistics from CP
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index e0d0c0ee0a39..15cb02efbe65 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_timer.c,v 1.5 1997/05/06 22:10:24 mks Exp $
+ * @(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_timer.c,v 1.5 1997/05/06 22:10:24 mks Exp $";
+__RCSID("@(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Process a Fore timer tick
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index 744e7751c756..bced06c25e67 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_transmit.c,v 1.8 1998/07/17 20:19:37 root Exp $
+ * @(#) $Id: fore_transmit.c,v 1.1 1998/09/15 08:22:56 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_transmit.c,v 1.8 1998/07/17 20:19:37 root Exp $";
+__RCSID("@(#) $Id: fore_transmit.c,v 1.1 1998/09/15 08:22:56 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* Allocate Transmit Queue Data Structures
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index 2481d17c20ba..325883b31b6e 100644
--- a/sys/dev/hfa/fore_vcm.c
+++ b/sys/dev/hfa/fore_vcm.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_vcm.c,v 1.1 1998/09/15 08:22:56 phk Exp $
+ * @(#) $Id: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <dev/hfa/fore_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_vcm.c,v 1.1 1998/09/15 08:22:56 phk Exp $";
+__RCSID("@(#) $Id: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
#endif
-#include <dev/hfa/fore_include.h>
-
/*
* VCC Stack Instantiation
diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c
index 4d365dd63b40..954438e87961 100644
--- a/sys/netatm/atm_aal5.c
+++ b/sys/netatm/atm_aal5.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: atm_aal5.c,v 1.1 1998/09/15 08:22:57 phk Exp $
+ * @(#) $Id: atm_aal5.c,v 1.2 1998/09/17 09:34:59 phk Exp $
*
*/
@@ -35,13 +35,13 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: atm_aal5.c,v 1.1 1998/09/15 08:22:57 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <sys/stat.h>
+#ifndef lint
+__RCSID("@(#) $Id: atm_aal5.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
+#endif
+
/*
* Global variables
@@ -193,15 +193,14 @@ static Atm_attributes atm_aal5_defattr = {
if (atm_stackq_head != NULL) \
panic("atm_aal5: stack queue not empty"); \
;
-#else
+#else /* !DIAGNOSTIC */
#define ATM_INTRO(f) \
int s, err = 0; \
s = splnet(); \
;
-#endif
+#endif /* DIAGNOSTIC */
#define ATM_OUTRO() \
-out: \
/* \
* Drain any deferred calls \
*/ \
@@ -244,7 +243,7 @@ atm_aal5_attach(so, proto, p)
*/
err = atm_sock_attach(so, atm_aal5_sendspace, atm_aal5_recvspace);
if (err)
- goto out;
+ ATM_RETERR(err);
/*
* Finish up any protocol specific stuff
@@ -258,6 +257,7 @@ atm_aal5_attach(so, proto, p)
atp->atp_attr = atm_aal5_defattr;
strncpy(atp->atp_name, "(AAL5)", T_ATM_APP_NAME_LEN);
+out:
ATM_OUTRO();
}
@@ -521,6 +521,7 @@ atm_aal5_send(so, flags, m, addr, control, p)
KB_FREEALL(m);
}
+out:
ATM_OUTRO();
}
@@ -852,6 +853,7 @@ atm_aal5_ctloutput(so, sopt)
break;
}
+out:
ATM_OUTRO();
}
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index 4304b56dc750..6ae42e8396bd 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: atm_cm.c,v 1.1 1998/09/15 08:22:57 phk Exp $
+ * @(#) $Id: atm_cm.c,v 1.2 1998/09/17 09:34:59 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <netatm/kern_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: atm_cm.c,v 1.1 1998/09/15 08:22:57 phk Exp $";
+__RCSID("@(#) $Id: atm_cm.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
#endif
-#include <netatm/kern_include.h>
-
/*
* Global variables
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index 3a65880e1574..dca6a00ec60d 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: atm_device.c,v 1.1 1998/09/15 08:22:57 phk Exp $
+ * @(#) $Id: atm_device.c,v 1.2 1998/09/17 09:34:59 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <netatm/kern_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: atm_device.c,v 1.1 1998/09/15 08:22:57 phk Exp $";
+__RCSID("@(#) $Id: atm_device.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
#endif
-#include <netatm/kern_include.h>
-
/*
* Private structures for managing allocated kernel memory resources
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index a07ccc2251d6..6ae7734bc133 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: atm_if.c,v 1.13 1998/07/23 21:43:55 root Exp $
+ * @(#) $Id: atm_if.c,v 1.1 1998/09/15 08:22:57 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <netatm/kern_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: atm_if.c,v 1.13 1998/07/23 21:43:55 root Exp $";
+__RCSID("@(#) $Id: atm_if.c,v 1.1 1998/09/15 08:22:57 phk Exp $");
#endif
-#include <netatm/kern_include.h>
-
#if (defined(BSD) && (BSD < 199506))
extern int ifqmaxlen;
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index ddd1a88bb201..5327e4ed923a 100644
--- a/sys/netatm/atm_proto.c
+++ b/sys/netatm/atm_proto.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: atm_proto.c,v 1.6 1998/02/19 19:52:06 mks Exp $
+ * @(#) $Id: atm_proto.c,v 1.1 1998/09/15 08:22:58 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <netatm/kern_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: atm_proto.c,v 1.6 1998/02/19 19:52:06 mks Exp $";
+__RCSID("@(#) $Id: atm_proto.c,v 1.1 1998/09/15 08:22:58 phk Exp $");
#endif
-#include <netatm/kern_include.h>
-
struct protosw atmsw[] = {
{ SOCK_DGRAM, /* ioctl()-only */
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index 8acbf7a11757..da46c98771a5 100644
--- a/sys/netatm/atm_signal.c
+++ b/sys/netatm/atm_signal.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: atm_signal.c,v 1.8 1998/03/24 20:45:37 mks Exp $
+ * @(#) $Id: atm_signal.c,v 1.1 1998/09/15 08:22:58 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <netatm/kern_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: atm_signal.c,v 1.8 1998/03/24 20:45:37 mks Exp $";
+__RCSID("@(#) $Id: atm_signal.c,v 1.1 1998/09/15 08:22:58 phk Exp $");
#endif
-#include <netatm/kern_include.h>
-
/*
* Local variables
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 2370a15fd070..537e8ae06cfa 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: atm_socket.c,v 1.3 1998/07/30 22:30:53 mks Exp $
+ * @(#) $Id: atm_socket.c,v 1.1 1998/09/15 08:22:58 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <netatm/kern_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: atm_socket.c,v 1.3 1998/07/30 22:30:53 mks Exp $";
+__RCSID("@(#) $Id: atm_socket.c,v 1.1 1998/09/15 08:22:58 phk Exp $");
#endif
-#include <netatm/kern_include.h>
-
/*
* Local functions
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index 3fcf36e16a79..328b6be5a57f 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: atm_subr.c,v 1.1 1998/09/15 08:22:59 phk Exp $
+ * @(#) $Id: atm_subr.c,v 1.2 1998/09/17 09:34:59 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <netatm/kern_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: atm_subr.c,v 1.1 1998/09/15 08:22:59 phk Exp $";
+__RCSID("@(#) $Id: atm_subr.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
#endif
-#include <netatm/kern_include.h>
-
/*
* Global variables
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index 4231d1c010d1..f5699ceb983b 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: atm_usrreq.c,v 1.7 1998/06/29 21:51:29 mks Exp $
+ * @(#) $Id: atm_usrreq.c,v 1.1 1998/09/15 08:22:59 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <netatm/kern_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: atm_usrreq.c,v 1.7 1998/06/29 21:51:29 mks Exp $";
+__RCSID("@(#) $Id: atm_usrreq.c,v 1.1 1998/09/15 08:22:59 phk Exp $");
#endif
-#include <netatm/kern_include.h>
-
/*
* Local functions
@@ -98,7 +98,6 @@ struct pr_usrreqs atm_dgram_usrreqs = {
#endif
#define ATM_OUTRO() \
-done: \
/* \
* Drain any deferred calls \
*/ \
@@ -109,7 +108,7 @@ done: \
#define ATM_RETERR(errno) { \
err = errno; \
- goto done; \
+ goto out; \
}
@@ -438,6 +437,7 @@ atm_dgram_control(so, cmd, data, ifp, p)
err = EOPNOTSUPP;
}
+out:
ATM_OUTRO();
}
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index 842ee64feaaa..66f736e6bbd0 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: ipatm_event.c,v 1.1 1998/09/15 08:23:00 phk Exp $
+ * @(#) $Id: ipatm_event.c,v 1.2 1998/09/17 09:35:00 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: ipatm_event.c,v 1.1 1998/09/15 08:23:00 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm.h>
#include <netatm/ipatm/ipatm_var.h>
#include <netatm/ipatm/ipatm_serv.h>
+#ifndef lint
+__RCSID("@(#) $Id: ipatm_event.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
/*
* Process an IP VCC timeout
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index ede2450ff8be..7cac3da4e319 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: ipatm_if.c,v 1.6 1998/03/24 20:51:47 mks Exp $
+ * @(#) $Id: ipatm_if.c,v 1.1 1998/09/15 08:23:00 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: ipatm_if.c,v 1.6 1998/03/24 20:51:47 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm.h>
#include <netatm/ipatm/ipatm_var.h>
#include <netatm/ipatm/ipatm_serv.h>
+#ifndef lint
+__RCSID("@(#) $Id: ipatm_if.c,v 1.1 1998/09/15 08:23:00 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index ca3e3e75a34a..5d292fe2c906 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: ipatm_input.c,v 1.9 1998/04/07 23:03:52 mks Exp $
+ * @(#) $Id: ipatm_input.c,v 1.1 1998/09/15 08:23:00 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: ipatm_input.c,v 1.9 1998/04/07 23:03:52 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm.h>
#include <netatm/ipatm/ipatm_var.h>
#include <netatm/ipatm/ipatm_serv.h>
+#ifndef lint
+__RCSID("@(#) $Id: ipatm_input.c,v 1.1 1998/09/15 08:23:00 phk Exp $");
+#endif
+
/*
* Process VCC Input Data
@@ -111,7 +111,10 @@ ipatm_ipinput(inp, m)
struct ip_nif *inp;
KBuffer *m;
{
- int s, space;
+ int s;
+#if BSD < 199103
+ int space;
+#endif
#ifdef DIAGNOSTIC
if (ipatm_print) {
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 8caa6354a4cb..38254150b1e2 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: ipatm_load.c,v 1.12 1998/07/30 22:23:00 mks Exp $
+ * @(#) $Id: ipatm_load.c,v 1.1 1998/09/15 08:23:00 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: ipatm_load.c,v 1.12 1998/07/30 22:23:00 mks Exp $";
-#endif
-
#ifndef ATM_IP_MODULE
#include "opt_atm.h"
#endif
@@ -49,6 +45,10 @@ static char *RCSid = "@(#) $Id: ipatm_load.c,v 1.12 1998/07/30 22:23:00 mks Exp
#include <netatm/ipatm/ipatm_var.h>
#include <netatm/ipatm/ipatm_serv.h>
+#ifndef lint
+__RCSID("@(#) $Id: ipatm_load.c,v 1.1 1998/09/15 08:23:00 phk Exp $");
+#endif
+
/*
* Global variables
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index 7f02f28c8505..54def8a1e506 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: ipatm_output.c,v 1.6 1998/02/19 20:14:17 mks Exp $
+ * @(#) $Id: ipatm_output.c,v 1.1 1998/09/15 08:23:01 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: ipatm_output.c,v 1.6 1998/02/19 20:14:17 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm.h>
#include <netatm/ipatm/ipatm_var.h>
#include <netatm/ipatm/ipatm_serv.h>
+#ifndef lint
+__RCSID("@(#) $Id: ipatm_output.c,v 1.1 1998/09/15 08:23:01 phk Exp $");
+#endif
+
/*
* Output an IP Packet
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index 1f1751c703d5..41bf42a862e2 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: ipatm_usrreq.c,v 1.6 1998/05/18 19:14:04 mks Exp $
+ * @(#) $Id: ipatm_usrreq.c,v 1.1 1998/09/15 08:23:01 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: ipatm_usrreq.c,v 1.6 1998/05/18 19:14:04 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm.h>
#include <netatm/ipatm/ipatm_var.h>
#include <netatm/ipatm/ipatm_serv.h>
+#ifndef lint
+__RCSID("@(#) $Id: ipatm_usrreq.c,v 1.1 1998/09/15 08:23:01 phk Exp $");
+#endif
+
/*
* Process IP PF_ATM ioctls
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index cb8f46bdb61a..8bfab7e5e064 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: ipatm_vcm.c,v 1.1 1998/09/15 08:23:01 phk Exp $
+ * @(#) $Id: ipatm_vcm.c,v 1.2 1998/09/17 09:35:00 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: ipatm_vcm.c,v 1.1 1998/09/15 08:23:01 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm.h>
#include <netatm/ipatm/ipatm_var.h>
#include <netatm/ipatm/ipatm_serv.h>
+#ifndef lint
+__RCSID("@(#) $Id: ipatm_vcm.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
Atm_attributes ipatm_aal5llc = {
NULL, /* nif */
diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c
index 4208f29f4cb3..b7117be9f41c 100644
--- a/sys/netatm/sigpvc/sigpvc_if.c
+++ b/sys/netatm/sigpvc/sigpvc_if.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sigpvc_if.c,v 1.13 1998/07/30 22:32:42 mks Exp $
+ * @(#) $Id: sigpvc_if.c,v 1.1 1998/09/15 08:23:02 phk Exp $
*
*/
@@ -36,10 +36,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sigpvc_if.c,v 1.13 1998/07/30 22:32:42 mks Exp $";
-#endif
-
#ifndef ATM_SIGPVC_MODULE
#include "opt_atm.h"
#endif
@@ -49,6 +45,10 @@ static char *RCSid = "@(#) $Id: sigpvc_if.c,v 1.13 1998/07/30 22:32:42 mks Exp $
#include <netatm/sigpvc/sigpvc.h>
#include <netatm/sigpvc/sigpvc_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sigpvc_if.c,v 1.1 1998/09/15 08:23:02 phk Exp $");
+#endif
+
/*
* Global variables
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index 00f92ec125e5..63e3b64fd577 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sigpvc_subr.c,v 1.7 1998/06/29 21:52:25 mks Exp $
+ * @(#) $Id: sigpvc_subr.c,v 1.1 1998/09/15 08:23:02 phk Exp $
*
*/
@@ -35,15 +35,15 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sigpvc_subr.c,v 1.7 1998/06/29 21:52:25 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/sigpvc/sigpvc.h>
#include <netatm/sigpvc/sigpvc_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sigpvc_subr.c,v 1.1 1998/09/15 08:23:02 phk Exp $");
+#endif
+
extern struct sp_info sigpvc_vcpool;
/*
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index 5a2443af9de3..bdcacc61f7c3 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: spans_arp.c,v 1.9 1998/06/29 22:03:12 mks Exp $
+ * @(#) $Id: spans_arp.c,v 1.1 1998/09/15 08:23:02 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_arp.c,v 1.9 1998/06/29 22:03:12 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: spans_arp.c,v 1.9 1998/06/29 22:03:12 mks Exp $"
#include <netatm/spans/spans_var.h>
#include <netatm/spans/spans_cls.h>
+#ifndef lint
+__RCSID("@(#) $Id: spans_arp.c,v 1.1 1998/09/15 08:23:02 phk Exp $");
+#endif
+
/*
* Global variables
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index f496311f0d39..f4a6ba8bf33e 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: spans_cls.c,v 1.11 1998/06/29 22:04:29 mks Exp $
+ * @(#) $Id: spans_cls.c,v 1.1 1998/09/15 08:23:03 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_cls.c,v 1.11 1998/06/29 22:04:29 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: spans_cls.c,v 1.11 1998/06/29 22:04:29 mks Exp $
#include <netatm/spans/spans_var.h>
#include <netatm/spans/spans_cls.h>
+#ifndef lint
+__RCSID("@(#) $Id: spans_cls.c,v 1.1 1998/09/15 08:23:03 phk Exp $");
+#endif
+
/*
* Global variables
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index 6546ae25a601..e03f36b70440 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: spans_if.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ * @(#) $Id: spans_if.c,v 1.2 1998/09/17 09:35:00 phk Exp $
*
*/
@@ -36,10 +36,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_if.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
-#endif
-
#ifndef ATM_SPANS_MODULE
#include "opt_atm.h"
#endif
@@ -49,6 +45,10 @@ static char *RCSid = "@(#) $Id: spans_if.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
#include "spans_xdr.h"
#include <netatm/spans/spans_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: spans_if.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
/*
* Global variables
*/
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index b6534de0e3f7..3843341c2241 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: spans_kxdr.c,v 1.2 1997/05/06 22:17:00 mks Exp $
+ * @(#) $Id: spans_kxdr.c,v 1.1 1998/09/15 08:23:03 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
+#include <netatm/kern_include.h>
+
#ifndef lint
-static char *RCSid = "@(#) $Id: spans_kxdr.c,v 1.2 1997/05/06 22:17:00 mks Exp $";
+__RCSID("@(#) $Id: spans_kxdr.c,v 1.1 1998/09/15 08:23:03 phk Exp $");
#endif
-#include <netatm/kern_include.h>
-
/*
* This file contains code that has been copied and/or modified from
* the following FreeBSD files:
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 1ce9a50eecfd..f04cc7fb3bed 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: spans_msg.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ * @(#) $Id: spans_msg.c,v 1.2 1998/09/17 09:35:00 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_msg.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <rpc/rpc.h>
#include "spans_xdr.h"
#include <netatm/spans/spans_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: spans_msg.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
/*
* External functions
*/
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 117324c29ef1..96e963b2a33f 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: spans_print.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ * @(#) $Id: spans_print.c,v 1.2 1998/09/17 09:35:00 phk Exp $
*
*/
@@ -35,15 +35,15 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_print.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include "spans_xdr.h"
#include <netatm/spans/spans_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: spans_print.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
/*
* If LONGPRINT is defined, every field of the SPANS message will be
* printed. If not, a shorter summary (useful for debugging without
@@ -54,11 +54,15 @@ static char *RCSid = "@(#) $Id: spans_print.c,v 1.1 1998/09/15 08:23:03 phk Exp
/*
* Local functions
*/
+static void spans_msgtype_str __P((spans_msgtype *, char *));
+static void spans_print_msgbody __P((spans_msgbody *));
+static void spans_result_str __P((spans_result *, char *));
+
+#ifdef LONGPRINT
+
static void inc_indent __P((void));
static void dec_indent __P((void));
static void spans_aal_str __P((spans_aal *, char *));
-static void spans_result_str __P((spans_result *, char *));
-static void spans_msgtype_str __P((spans_msgtype *, char *));
static void spans_query_type_str __P((spans_query_type *, char *));
static void spans_state_str __P((spans_query_type *, char *));
static void spans_print_version __P((spans_version *));
@@ -101,7 +105,6 @@ static void spans_print_parm_leave_cnf __P((spans_parm_leave_cnf *));
static void spans_print_parm_vcir_ind __P((spans_parm_vcir_ind *));
static void spans_print_parm_query_req __P((spans_parm_query_req *));
static void spans_print_parm_query_rsp __P((spans_parm_query_rsp *));
-static void spans_print_msgbody __P((spans_msgbody *));
/*
@@ -116,7 +119,7 @@ static void
inc_indent()
{
if (spans_indent != &indent_str[0]) {
- *spans_indent--;
+ spans_indent--;
}
}
@@ -124,7 +127,7 @@ static void
dec_indent()
{
if (spans_indent != INIT_INDENT) {
- *spans_indent++;
+ spans_indent++;
}
}
@@ -150,6 +153,8 @@ spans_aal_str(objp, dest)
}
}
+#endif
+
static void
spans_result_str(objp, dest)
spans_result *objp;
@@ -233,6 +238,8 @@ spans_msgtype_str(objp, dest)
sprintf(dest, "Invalid (%d)", (int)*objp);
}
+#ifdef LONGPRINT
+
static void
spans_query_type_str(objp, dest)
spans_query_type *objp;
@@ -273,7 +280,6 @@ spans_state_str(objp, dest)
}
}
-#ifdef LONGPRINT
static void
spans_print_version(objp)
@@ -1055,7 +1061,9 @@ void
spans_print_msg(objp)
spans_msg *objp;
{
+#ifdef LONGPRINT
spans_indent = INIT_INDENT;
+#endif
spans_print_msgbody(&objp->sm_body);
}
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index b0e0f1e44c1e..2cd2f7226242 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: spans_proto.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ * @(#) $Id: spans_proto.c,v 1.2 1998/09/17 09:35:00 phk Exp $
*
*/
@@ -35,15 +35,15 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_proto.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include "spans_xdr.h"
#include <netatm/spans/spans_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: spans_proto.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
/*
* Internal functions
*/
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index a6e720f811c4..b2a418c454b5 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: spans_subr.c,v 1.1 1998/09/15 08:23:04 phk Exp $
+ * @(#) $Id: spans_subr.c,v 1.2 1998/09/17 09:35:00 phk Exp $
*
*/
@@ -35,15 +35,15 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_subr.c,v 1.1 1998/09/15 08:23:04 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include "spans_xdr.h"
#include <netatm/spans/spans_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: spans_subr.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
/*
* Open a SPANS VCC
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index f3f0235264f6..904f176d2d56 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: spans_util.c,v 1.1 1998/09/15 08:23:04 phk Exp $
+ * @(#) $Id: spans_util.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,15 +35,15 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_util.c,v 1.1 1998/09/15 08:23:04 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include "spans_xdr.h"
#include <netatm/spans/spans_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: spans_util.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
#ifdef NOTDEF
/* XXX -- Remove all SAP checks? */
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index 357df710c294..381356f6c7e8 100644
--- a/sys/netatm/uni/q2110_sigaa.c
+++ b/sys/netatm/uni/q2110_sigaa.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: q2110_sigaa.c,v 1.6 1998/08/26 23:29:18 mks Exp $
+ * @(#) $Id: q2110_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: q2110_sigaa.c,v 1.6 1998/08/26 23:29:18 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: q2110_sigaa.c,v 1.6 1998/08/26 23:29:18 mks Exp
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: q2110_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c
index 0fa5555a7ce9..7752fd04278e 100644
--- a/sys/netatm/uni/q2110_sigcpcs.c
+++ b/sys/netatm/uni/q2110_sigcpcs.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: q2110_sigcpcs.c,v 1.7 1998/08/26 23:29:18 mks Exp $
+ * @(#) $Id: q2110_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: q2110_sigcpcs.c,v 1.7 1998/08/26 23:29:18 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: q2110_sigcpcs.c,v 1.7 1998/08/26 23:29:18 mks Ex
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: q2110_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c
index 4c6036b8de2b..32f3833aa134 100644
--- a/sys/netatm/uni/q2110_subr.c
+++ b/sys/netatm/uni/q2110_subr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: q2110_subr.c,v 1.1 1998/04/07 23:15:20 mks Exp $
+ * @(#) $Id: q2110_subr.c,v 1.1 1998/09/15 08:23:05 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: q2110_subr.c,v 1.1 1998/04/07 23:15:20 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: q2110_subr.c,v 1.1 1998/04/07 23:15:20 mks Exp $
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: q2110_subr.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+#endif
+
/*
* Conditionally Clear Transmission Queues
diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c
index f3b00973f1e0..1788794c5b00 100644
--- a/sys/netatm/uni/qsaal1_sigaa.c
+++ b/sys/netatm/uni/qsaal1_sigaa.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: qsaal1_sigaa.c,v 1.7 1998/08/26 23:29:18 mks Exp $
+ * @(#) $Id: qsaal1_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: qsaal1_sigaa.c,v 1.7 1998/08/26 23:29:18 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: qsaal1_sigaa.c,v 1.7 1998/08/26 23:29:18 mks Exp
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: qsaal1_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c
index 1d6216555bb0..203e483e6a03 100644
--- a/sys/netatm/uni/qsaal1_sigcpcs.c
+++ b/sys/netatm/uni/qsaal1_sigcpcs.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: qsaal1_sigcpcs.c,v 1.7 1998/04/07 23:21:03 mks Exp $
+ * @(#) $Id: qsaal1_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: qsaal1_sigcpcs.c,v 1.7 1998/04/07 23:21:03 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: qsaal1_sigcpcs.c,v 1.7 1998/04/07 23:21:03 mks E
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: qsaal1_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c
index ed4b43cb3758..9ad2468dc52a 100644
--- a/sys/netatm/uni/qsaal1_subr.c
+++ b/sys/netatm/uni/qsaal1_subr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: qsaal1_subr.c,v 1.6 1998/04/07 23:21:17 mks Exp $
+ * @(#) $Id: qsaal1_subr.c,v 1.1 1998/09/15 08:23:06 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: qsaal1_subr.c,v 1.6 1998/04/07 23:21:17 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: qsaal1_subr.c,v 1.6 1998/04/07 23:21:17 mks Exp
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: qsaal1_subr.c,v 1.1 1998/09/15 08:23:06 phk Exp $");
+#endif
+
/*
* Re-establish a new SSCOP Connection
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index 05825808c52c..49e7186ad7d1 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscf_uni.c,v 1.1 1998/09/15 08:23:06 phk Exp $
+ * @(#) $Id: sscf_uni.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscf_uni.c,v 1.1 1998/09/15 08:23:06 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: sscf_uni.c,v 1.1 1998/09/15 08:23:06 phk Exp $";
#include <netatm/uni/sscf_uni.h>
#include <netatm/uni/sscf_uni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscf_uni.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
/*
* Global variables
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 9639d96fa32f..56db85fd7de9 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscf_uni_lower.c,v 1.1 1998/09/15 08:23:06 phk Exp $
+ * @(#) $Id: sscf_uni_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscf_uni_lower.c,v 1.1 1998/09/15 08:23:06 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: sscf_uni_lower.c,v 1.1 1998/09/15 08:23:06 phk E
#include <netatm/uni/sscf_uni.h>
#include <netatm/uni/sscf_uni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscf_uni_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
/*
* Local variables
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index a979260ac0b3..24a41f555be3 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscf_uni_upper.c,v 1.1 1998/09/15 08:23:06 phk Exp $
+ * @(#) $Id: sscf_uni_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscf_uni_upper.c,v 1.1 1998/09/15 08:23:06 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: sscf_uni_upper.c,v 1.1 1998/09/15 08:23:06 phk E
#include <netatm/uni/sscf_uni.h>
#include <netatm/uni/sscf_uni_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscf_uni_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
/*
* SSCF_UNI Upper Stack Command Handler
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index d4a2dfb07085..bfd37bdac07b 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscop.c,v 1.1 1998/09/15 08:23:06 phk Exp $
+ * @(#) $Id: sscop.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscop.c,v 1.1 1998/09/15 08:23:06 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: sscop.c,v 1.1 1998/09/15 08:23:06 phk Exp $";
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscop.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
/*
* Global variables
@@ -205,7 +205,6 @@ sscop_stop()
*/
atm_release_pool(&sscop_pool);
-done:
return (err);
}
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 536ed0386dd3..3810f91123fd 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscop_lower.c,v 1.1 1998/09/15 08:23:07 phk Exp $
+ * @(#) $Id: sscop_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscop_lower.c,v 1.1 1998/09/15 08:23:07 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: sscop_lower.c,v 1.1 1998/09/15 08:23:07 phk Exp
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscop_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
/*
* Local variables
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index b9aec0340009..86522b922120 100644
--- a/sys/netatm/uni/sscop_pdu.c
+++ b/sys/netatm/uni/sscop_pdu.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscop_pdu.c,v 1.6 1998/04/07 23:21:36 mks Exp $
+ * @(#) $Id: sscop_pdu.c,v 1.1 1998/09/15 08:23:07 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscop_pdu.c,v 1.6 1998/04/07 23:21:36 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: sscop_pdu.c,v 1.6 1998/04/07 23:21:36 mks Exp $"
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscop_pdu.c,v 1.1 1998/09/15 08:23:07 phk Exp $");
+#endif
+
/*
* Local functions
*/
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 8f347ce5ebe1..675398216139 100644
--- a/sys/netatm/uni/sscop_sigaa.c
+++ b/sys/netatm/uni/sscop_sigaa.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscop_sigaa.c,v 1.1 1998/04/07 23:15:11 mks Exp $
+ * @(#) $Id: sscop_sigaa.c,v 1.1 1998/09/15 08:23:07 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscop_sigaa.c,v 1.1 1998/04/07 23:15:11 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: sscop_sigaa.c,v 1.1 1998/04/07 23:15:11 mks Exp
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscop_sigaa.c,v 1.1 1998/09/15 08:23:07 phk Exp $");
+#endif
+
/*
* SSCOP_ESTABLISH_REQ / SOS_IDLE Command Processor
diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c
index a9bf504d99c4..6b1c477bbb01 100644
--- a/sys/netatm/uni/sscop_sigcpcs.c
+++ b/sys/netatm/uni/sscop_sigcpcs.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscop_sigcpcs.c,v 1.2 1998/07/24 20:18:09 mks Exp $
+ * @(#) $Id: sscop_sigcpcs.c,v 1.1 1998/09/15 08:23:08 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscop_sigcpcs.c,v 1.2 1998/07/24 20:18:09 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: sscop_sigcpcs.c,v 1.2 1998/07/24 20:18:09 mks Ex
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscop_sigcpcs.c,v 1.1 1998/09/15 08:23:08 phk Exp $");
+#endif
+
/*
* No-op Processor
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index 88656adb098e..16ad1395a243 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscop_subr.c,v 1.1 1998/09/15 08:23:08 phk Exp $
+ * @(#) $Id: sscop_subr.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscop_subr.c,v 1.1 1998/09/15 08:23:08 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: sscop_subr.c,v 1.1 1998/09/15 08:23:08 phk Exp $
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscop_subr.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c
index c66525b9f08e..087ae79e96cd 100644
--- a/sys/netatm/uni/sscop_timer.c
+++ b/sys/netatm/uni/sscop_timer.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscop_timer.c,v 1.1 1998/09/15 08:23:08 phk Exp $
+ * @(#) $Id: sscop_timer.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscop_timer.c,v 1.1 1998/09/15 08:23:08 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: sscop_timer.c,v 1.1 1998/09/15 08:23:08 phk Exp
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscop_timer.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index 162b48cbd1ac..f2ad1bd95c5e 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: sscop_upper.c,v 1.1 1998/09/15 08:23:08 phk Exp $
+ * @(#) $Id: sscop_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: sscop_upper.c,v 1.1 1998/09/15 08:23:08 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: sscop_upper.c,v 1.1 1998/09/15 08:23:08 phk Exp
#include <netatm/uni/sscop_pdu.h>
#include <netatm/uni/sscop_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: sscop_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index 23e7ff586bdb..7be1eba01a0c 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: uni_load.c,v 1.6 1997/05/06 22:20:43 mks Exp $
+ * @(#) $Id: uni_load.c,v 1.1 1998/09/15 08:23:09 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: uni_load.c,v 1.6 1997/05/06 22:20:43 mks Exp $";
-#endif
-
#ifndef ATM_UNI_MODULE
#include "opt_atm.h"
#endif
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: uni_load.c,v 1.6 1997/05/06 22:20:43 mks Exp $";
#include <netatm/uni/uni.h>
+#ifndef lint
+__RCSID("@(#) $Id: uni_load.c,v 1.1 1998/09/15 08:23:09 phk Exp $");
+#endif
+
/*
* External functions
*/
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index e0448a8a8c11..b97254132fba 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: uniarp.c,v 1.1 1998/09/15 08:23:09 phk Exp $
+ * @(#) $Id: uniarp.c,v 1.2 1998/09/17 09:35:01 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: uniarp.c,v 1.1 1998/09/15 08:23:09 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: uniarp.c,v 1.1 1998/09/15 08:23:09 phk Exp $";
#include <netatm/uni/unisig_var.h>
#include <netatm/uni/uniip_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: uniarp.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
/*
* Global variables
@@ -225,7 +225,6 @@ void
uniarp_ipdact(uip)
struct uniip *uip;
{
- struct ip_nif *inp = uip->uip_ipnif;
struct uniarp *uap, *unext;
int i;
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index 6c9537e722c6..c5bf5aee61d7 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: uniarp_cache.c,v 1.8 1998/08/26 23:29:20 mks Exp $
+ * @(#) $Id: uniarp_cache.c,v 1.1 1998/09/15 08:23:09 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: uniarp_cache.c,v 1.8 1998/08/26 23:29:20 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: uniarp_cache.c,v 1.8 1998/08/26 23:29:20 mks Exp
#include <netatm/uni/unisig_var.h>
#include <netatm/uni/uniip_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: uniarp_cache.c,v 1.1 1998/09/15 08:23:09 phk Exp $");
+#endif
+
/*
* Add data to the arp table cache
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index cceeaa92c87f..9ef62250e08b 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: uniarp_input.c,v 1.10 1998/07/13 00:04:32 mks Exp $
+ * @(#) $Id: uniarp_input.c,v 1.1 1998/09/15 08:23:09 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: uniarp_input.c,v 1.10 1998/07/13 00:04:32 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: uniarp_input.c,v 1.10 1998/07/13 00:04:32 mks Ex
#include <netatm/uni/unisig_var.h>
#include <netatm/uni/uniip_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: uniarp_input.c,v 1.1 1998/09/15 08:23:09 phk Exp $");
+#endif
+
/*
* Local functions
@@ -735,7 +735,6 @@ proc_inarp_rsp(ivp, m)
struct atm_nif *nip;
struct siginst *sgp;
struct uniip *uip;
- struct uniarp *uap;
struct in_addr myip;
int s = splnet();
diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c
index 81fab93219c7..4f7a16388d09 100644
--- a/sys/netatm/uni/uniarp_output.c
+++ b/sys/netatm/uni/uniarp_output.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: uniarp_output.c,v 1.7 1998/06/29 22:15:41 mks Exp $
+ * @(#) $Id: uniarp_output.c,v 1.1 1998/09/15 08:23:09 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: uniarp_output.c,v 1.7 1998/06/29 22:15:41 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
#include <netatm/ipatm/ipatm_serv.h>
#include <netatm/uni/uniip_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: uniarp_output.c,v 1.1 1998/09/15 08:23:09 phk Exp $");
+#endif
+
/*
* Issue an ATMARP Request PDU
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index 1f002023e544..b65ca568cdd8 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: uniarp_timer.c,v 1.8 1998/06/29 22:44:31 mks Exp $
+ * @(#) $Id: uniarp_timer.c,v 1.1 1998/09/15 08:23:10 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: uniarp_timer.c,v 1.8 1998/06/29 22:44:31 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: uniarp_timer.c,v 1.8 1998/06/29 22:44:31 mks Exp
#include <netatm/uni/unisig_var.h>
#include <netatm/uni/uniip_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: uniarp_timer.c,v 1.1 1998/09/15 08:23:10 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index 338d2b50264b..e2e9c2d28973 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: uniarp_vcm.c,v 1.1 1998/09/15 08:23:10 phk Exp $
+ * @(#) $Id: uniarp_vcm.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: uniarp_vcm.c,v 1.1 1998/09/15 08:23:10 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: uniarp_vcm.c,v 1.1 1998/09/15 08:23:10 phk Exp $
#include <netatm/uni/unisig_var.h>
#include <netatm/uni/uniip_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: uniarp_vcm.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* Local variables
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 003958514671..dd7bc3e3f807 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: uniip.c,v 1.6 1998/05/18 19:18:42 mks Exp $
+ * @(#) $Id: uniip.c,v 1.1 1998/09/15 08:23:10 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: uniip.c,v 1.6 1998/05/18 19:18:42 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
#include <netatm/ipatm/ipatm_serv.h>
#include <netatm/uni/uniip_var.h>
+#ifndef lint
+__RCSID("@(#) $Id: uniip.c,v 1.1 1998/09/15 08:23:10 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index d7d3cd4be92c..08fe4b728a7c 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_decode.c,v 1.1 1998/09/15 08:23:10 phk Exp $
+ * @(#) $Id: unisig_decode.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_decode.c,v 1.1 1998/09/15 08:23:10 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/unisig.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: unisig_decode.c,v 1.1 1998/09/15 08:23:10 phk Ex
#include <netatm/uni/unisig_mbuf.h>
#include <netatm/uni/unisig_decode.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_decode.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
#define ALLOC_IE(ie) \
(ie) = (struct ie_generic *) atm_allocate(&unisig_iepool); \
if (!ie) \
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index a142a33e43ab..34a039aec159 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_encode.c,v 1.1 1998/09/15 08:23:11 phk Exp $
+ * @(#) $Id: unisig_encode.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_encode.c,v 1.1 1998/09/15 08:23:11 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/unisig.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: unisig_encode.c,v 1.1 1998/09/15 08:23:11 phk Ex
#include <netatm/uni/unisig_mbuf.h>
#include <netatm/uni/unisig_decode.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_encode.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c
index e52f650a3536..e1cfc8f98b84 100644
--- a/sys/netatm/uni/unisig_if.c
+++ b/sys/netatm/uni/unisig_if.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_if.c,v 1.1 1998/09/15 08:23:11 phk Exp $
+ * @(#) $Id: unisig_if.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_if.c,v 1.1 1998/09/15 08:23:11 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/ipatm/ipatm_var.h>
@@ -50,6 +46,10 @@ static char *RCSid = "@(#) $Id: unisig_if.c,v 1.1 1998/09/15 08:23:11 phk Exp $"
#include <netatm/uni/unisig_var.h>
#include <netatm/uni/unisig_msg.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_if.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* Global variables
diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c
index c64ee9a85fac..b96a636a4be8 100644
--- a/sys/netatm/uni/unisig_mbuf.c
+++ b/sys/netatm/uni/unisig_mbuf.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_mbuf.c,v 1.1 1998/09/15 08:23:11 phk Exp $
+ * @(#) $Id: unisig_mbuf.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_mbuf.c,v 1.1 1998/09/15 08:23:11 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/unisig_var.h>
#include <netatm/uni/unisig_mbuf.h>
#include <netatm/uni/unisig_msg.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_mbuf.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* Initialize a unisig formatting structure
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index 4e61cf48571d..510b92ea0e76 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_msg.c,v 1.1 1998/09/15 08:23:11 phk Exp $
+ * @(#) $Id: unisig_msg.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_msg.c,v 1.1 1998/09/15 08:23:11 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/unisig.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: unisig_msg.c,v 1.1 1998/09/15 08:23:11 phk Exp $
#include <netatm/uni/unisig_mbuf.h>
#include <netatm/uni/unisig_print.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_msg.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index f335ce45a7b3..93133cad3d6e 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_print.c,v 1.9 1998/08/26 23:29:23 mks Exp $
+ * @(#) $Id: unisig_print.c,v 1.1 1998/09/15 08:23:12 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_print.c,v 1.9 1998/08/26 23:29:23 mks Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/unisig.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: unisig_print.c,v 1.9 1998/08/26 23:29:23 mks Exp
#include <netatm/uni/unisig_msg.h>
#include <netatm/uni/unisig_print.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_print.c,v 1.1 1998/09/15 08:23:12 phk Exp $");
+#endif
+
/*
* Local declarations
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index bbad9e64ff85..8a3daac6753a 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_proto.c,v 1.1 1998/09/15 08:23:12 phk Exp $
+ * @(#) $Id: unisig_proto.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_proto.c,v 1.1 1998/09/15 08:23:12 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/unisig.h>
@@ -46,6 +42,10 @@ static char *RCSid = "@(#) $Id: unisig_proto.c,v 1.1 1998/09/15 08:23:12 phk Exp
#include <netatm/uni/unisig_msg.h>
#include <netatm/uni/unisig_mbuf.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_proto.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* Process a UNISIG timeout
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index 0439d1c75888..fe9a01061acb 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_sigmgr_state.c,v 1.1 1998/09/15 08:23:12 phk Exp $
+ * @(#) $Id: unisig_sigmgr_state.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_sigmgr_state.c,v 1.1 1998/09/15 08:23:12 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/uni.h>
@@ -50,6 +46,10 @@ static char *RCSid = "@(#) $Id: unisig_sigmgr_state.c,v 1.1 1998/09/15 08:23:12
#include <netatm/uni/sscf_uni.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_sigmgr_state.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* Local functions
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 52326bc2bc46..215204444b1e 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_subr.c,v 1.1 1998/09/15 08:23:12 phk Exp $
+ * @(#) $Id: unisig_subr.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_subr.c,v 1.1 1998/09/15 08:23:12 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/unisig.h>
#include <netatm/uni/unisig_var.h>
#include <netatm/uni/unisig_msg.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_subr.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* External variables
diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c
index d7a64f6b17e5..6a3afb895b4f 100644
--- a/sys/netatm/uni/unisig_util.c
+++ b/sys/netatm/uni/unisig_util.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_util.c,v 1.1 1998/09/15 08:23:13 phk Exp $
+ * @(#) $Id: unisig_util.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,16 +35,16 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_util.c,v 1.1 1998/09/15 08:23:13 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/unisig.h>
#include <netatm/uni/unisig_var.h>
#include <netatm/uni/unisig_msg.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_util.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* Free a UNISIG signalling message
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index e52515d3d798..28ae9dea3110 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: unisig_vc_state.c,v 1.1 1998/09/15 08:23:13 phk Exp $
+ * @(#) $Id: unisig_vc_state.c,v 1.2 1998/09/17 09:35:02 phk Exp $
*
*/
@@ -35,10 +35,6 @@
*
*/
-#ifndef lint
-static char *RCSid = "@(#) $Id: unisig_vc_state.c,v 1.1 1998/09/15 08:23:13 phk Exp $";
-#endif
-
#include <netatm/kern_include.h>
#include <netatm/uni/unisig.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: unisig_vc_state.c,v 1.1 1998/09/15 08:23:13 phk
#include <netatm/uni/unisig_mbuf.h>
#include <netatm/uni/unisig_decode.h>
+#ifndef lint
+__RCSID("@(#) $Id: unisig_vc_state.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+#endif
+
/*
* Local functions