32 files changed, 36 insertions, 12 deletions

diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index 44506272d9267..f5f2f58537beb 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -36,6 +36,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <net/if.h>
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index ec3cd5526549b..0af1f32166f1a 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -37,6 +37,7 @@
 
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netatm/port.h>
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index eebc6ec9fe469..2193a5161b6b5 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -157,13 +157,8 @@ fore_intr(arg)
 		/*
 		 * Clear the device interrupt
 		 */
-		switch (fup->fu_config.ac_device) {
-
-		case DEV_FORE_PCA200E:
+		if (fup->fu_config.ac_device == DEV_FORE_PCA200E)
 			PCA200E_HCR_SET(*fup->fu_ctlreg, PCA200E_CLR_HBUS_INT);
-			break;
-
-		}
 		aap->aali_intr_sent = CP_WRITE(0);
 
 		/*
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index 70433453f456b..be586895cc709 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -499,18 +499,14 @@ fore_reset(fup)
 
 	if (fup->fu_ctlreg) {
 
-		switch (fup->fu_config.ac_device) {
-
-		case DEV_FORE_PCA200E:
+		if (fup->fu_config.ac_device == DEV_FORE_PCA200E) {
 			/*
 			 * Reset i960 by setting and clearing RESET
 			 */
 			PCA200E_HCR_INIT(*fup->fu_ctlreg, PCA200E_RESET);
 			DELAY(10000);
 			PCA200E_HCR_CLR(*fup->fu_ctlreg, PCA200E_RESET);
-			break;
-
-		}
+		 }
 	}
 
 	(void) splx(s);
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index 42bec3ef56a66..0260ee0b72ab9 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -36,6 +36,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -543,6 +544,9 @@ atm_physif_ioctl(code, data, arg)
 			case MEDIA_UTP155:
 				ifp->if_baudrate = 155000000;
 				break;
+			case MEDIA_UNKNOWN:
+				ifp->if_baudrate = 9600;
+				break;
 			}
 #endif
 
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index 2e107b5f58978..dc31cfefa8f06 100644
--- a/sys/netatm/atm_signal.c
+++ b/sys/netatm/atm_signal.c
@@ -36,6 +36,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <net/if.h>
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 649ec8913d563..6d87791bc5a6e 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -36,6 +36,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index 41c2fd96b664e..6965d9c9fd3e0 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -36,6 +36,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index 7effe3fcb021c..5471ef2f2fc44 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 7e002af1967e6..d0f381c5c4844 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 242692c1324e5..7112b3be0b7e0 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -41,6 +41,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index 50b8c2f22b8e9..431f9ff5ecdb2 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 710de5cc7cdd4..aceb80457afce 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index 1d63c6548b328..aff39b2a1e85c 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index b536ed34519b6..5dbee5e70557f 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index d0ebf9d77f78f..de9c32af844d6 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 02ffa6b2c37b1..d8c36773055bd 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index d88f65dfaddcf..8f4d0c8f86d51 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index 3de4ef0bbd90e..9381077d51b11 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index dbaf1c4d668ef..bfb8eb7bacca2 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index 3d4beb4521d44..7981813031ca9 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index d1e7c7a9c2fd9..107c9741a84de 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index fddc8f2f3aeb0..a035254f9dc84 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -41,6 +41,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index e6f42f452a4f5..271fcfd881a77 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c
index efc6cbd264314..c83a78f0e6875 100644
--- a/sys/netatm/uni/uniarp_output.c
+++ b/sys/netatm/uni/uniarp_output.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index 95c3c3ebe8522..5903e041e612c 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index d2e0383f5f9c5..227130a75ac83 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c
index f5d90cf38a23d..5123eccc6d076 100644
--- a/sys/netatm/uni/unisig_mbuf.c
+++ b/sys/netatm/uni/unisig_mbuf.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index 246191d08253b..542ce18516a0e 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index 37abbe5cc896b..a429da26a0c5c 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 8422b9ab89afc..65a9d04988bf6 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index 4de204ca6d16e..f1ada5a015c41 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/time.h>
 #include <sys/socket.h>