From d2cc167c49a23e548f11fc4626d5d1addb480206 Mon Sep 17 00:00:00 2001 From: Bill Joy Date: Sat, 9 Oct 1982 14:11:47 -0800 Subject: [PATCH] fix includes SCCS-vsn: sys/vax/if/if_acc.c 4.20 SCCS-vsn: sys/vax/if/if_css.c 4.2 SCCS-vsn: sys/vax/if/if_dmc.c 4.18 SCCS-vsn: sys/vax/if/if_ec.c 4.23 SCCS-vsn: sys/vax/if/if_en.c 4.68 SCCS-vsn: sys/vax/if/if_il.c 4.11 SCCS-vsn: sys/vax/if/if_uba.c 4.13 SCCS-vsn: sys/vax/if/if_vv.c 4.7 --- usr/src/sys/vax/if/if_acc.c | 12 ++++++------ usr/src/sys/vax/if/if_css.c | 10 ++++------ usr/src/sys/vax/if/if_dmc.c | 12 +++++------- usr/src/sys/vax/if/if_ec.c | 16 ++++++++-------- usr/src/sys/vax/if/if_en.c | 16 ++++++++-------- usr/src/sys/vax/if/if_il.c | 16 ++++++++-------- usr/src/sys/vax/if/if_uba.c | 6 ++---- usr/src/sys/vax/if/if_vv.c | 16 +++++++++------- 8 files changed, 50 insertions(+), 54 deletions(-) diff --git a/usr/src/sys/vax/if/if_acc.c b/usr/src/sys/vax/if/if_acc.c index 12d4cf362a..7df524c18a 100644 --- a/usr/src/sys/vax/if/if_acc.c +++ b/usr/src/sys/vax/if/if_acc.c @@ -1,4 +1,4 @@ -/* if_acc.c 4.19 82/06/20 */ +/* if_acc.c 4.20 82/10/09 */ #include "acc.h" #ifdef NACC > 0 @@ -19,12 +19,10 @@ #include "../h/cpu.h" #include "../h/mtpr.h" #include "../h/vmmac.h" -#include "../net/in.h" -#include "../net/in_systm.h" #include "../net/if.h" -#include "../net/if_acc.h" -#include "../net/if_imp.h" -#include "../net/if_uba.h" +#include "../vaxif/if_acc.h" +#include "../netimp/if_imp.h" +#include "../vaxif/if_uba.h" int accprobe(), accattach(), accrint(), accxint(); struct uba_device *accinfo[NACC]; @@ -271,6 +269,7 @@ restart: * Output interrupt handler. */ accxint(unit) + int unit; { register struct acc_softc *sc = &acc_softc[unit]; register struct accdevice *addr; @@ -300,6 +299,7 @@ accxint(unit) * Input interrupt handler */ accrint(unit) + int unit; { register struct acc_softc *sc = &acc_softc[unit]; register struct accdevice *addr; diff --git a/usr/src/sys/vax/if/if_css.c b/usr/src/sys/vax/if/if_css.c index a41c02c97c..5f32281573 100644 --- a/usr/src/sys/vax/if/if_css.c +++ b/usr/src/sys/vax/if/if_css.c @@ -1,4 +1,4 @@ -/* if_css.c 4.1 82/07/20 */ +/* if_css.c 4.2 82/10/09 */ #include "css.h" @@ -39,12 +39,10 @@ #include "../h/cpu.h" #include "../h/mtpr.h" #include "../h/vmmac.h" -#include "../net/if_css.h" -#include "../net/in.h" -#include "../net/in_systm.h" +#include "../vaxif/if_css.h" #include "../net/if.h" -#include "../net/if_imp.h" -#include "../net/if_uba.h" +#include "../netimp/if_imp.h" +#include "../vaxif/if_uba.h" int cssprobe(), cssattach(), cssrint(), cssxint(); struct uba_device *cssinfo[NCSS]; diff --git a/usr/src/sys/vax/if/if_dmc.c b/usr/src/sys/vax/if/if_dmc.c index 96874d597b..a2b5bf43db 100644 --- a/usr/src/sys/vax/if/if_dmc.c +++ b/usr/src/sys/vax/if/if_dmc.c @@ -1,4 +1,4 @@ -/* if_dmc.c 4.17 82/06/20 */ +/* if_dmc.c 4.18 82/10/09 */ #include "dmc.h" #if NDMC > 0 @@ -24,13 +24,11 @@ int dmcdebug = 1; #include "../h/cpu.h" #include "../h/mtpr.h" #include "../h/vmmac.h" -#include "../net/in.h" -#include "../net/in_systm.h" +#include "../netinet/in.h" +#include "../netinet/in_systm.h" #include "../net/if.h" -#include "../net/if_uba.h" -#include "../net/if_dmc.h" -#include "../net/ip.h" -#include "../net/ip_var.h" +#include "../vaxif/if_uba.h" +#include "../vaxif/if_dmc.h" #include "../net/route.h" #include diff --git a/usr/src/sys/vax/if/if_ec.c b/usr/src/sys/vax/if/if_ec.c index 94b0d5b32c..47f625a51f 100644 --- a/usr/src/sys/vax/if/if_ec.c +++ b/usr/src/sys/vax/if/if_ec.c @@ -1,4 +1,4 @@ -/* if_ec.c 4.22 82/07/21 */ +/* if_ec.c 4.23 82/10/09 */ #include "ec.h" @@ -19,14 +19,14 @@ #include "../h/cpu.h" #include "../h/mtpr.h" #include "../h/vmmac.h" -#include "../net/in.h" -#include "../net/in_systm.h" +#include "../netinet/in.h" +#include "../netinet/in_systm.h" #include "../net/if.h" -#include "../net/if_ec.h" -#include "../net/if_uba.h" -#include "../net/ip.h" -#include "../net/ip_var.h" -#include "../net/pup.h" +#include "../vaxif/if_ec.h" +#include "../vaxif/if_uba.h" +#include "../netinet/ip.h" +#include "../netinet/ip_var.h" +#include "../netpup/pup.h" #include "../net/route.h" #include diff --git a/usr/src/sys/vax/if/if_en.c b/usr/src/sys/vax/if/if_en.c index b4a13cb4d0..8b0fb8b3c1 100644 --- a/usr/src/sys/vax/if/if_en.c +++ b/usr/src/sys/vax/if/if_en.c @@ -1,4 +1,4 @@ -/* if_en.c 4.67 82/06/20 */ +/* if_en.c 4.68 82/10/09 */ #include "en.h" @@ -19,14 +19,14 @@ #include "../h/cpu.h" #include "../h/mtpr.h" #include "../h/vmmac.h" -#include "../net/in.h" -#include "../net/in_systm.h" +#include "../netinet/in.h" +#include "../netinet/in_systm.h" #include "../net/if.h" -#include "../net/if_en.h" -#include "../net/if_uba.h" -#include "../net/ip.h" -#include "../net/ip_var.h" -#include "../net/pup.h" +#include "../vaxif/if_en.h" +#include "../vaxif/if_uba.h" +#include "../netinet/ip.h" +#include "../netinet/ip_var.h" +#include "../netpup/pup.h" #include "../net/route.h" #include diff --git a/usr/src/sys/vax/if/if_il.c b/usr/src/sys/vax/if/if_il.c index cae6804c74..1f03ac3010 100644 --- a/usr/src/sys/vax/if/if_il.c +++ b/usr/src/sys/vax/if/if_il.c @@ -1,4 +1,4 @@ -/* if_il.c 4.10 82/06/24 */ +/* if_il.c 4.11 82/10/09 */ #include "il.h" @@ -18,14 +18,14 @@ #include "../h/cpu.h" #include "../h/mtpr.h" #include "../h/vmmac.h" -#include "../net/in.h" -#include "../net/in_systm.h" +#include "../netinet/in.h" +#include "../netinet/in_systm.h" #include "../net/if.h" -#include "../net/if_il.h" -#include "../net/if_uba.h" -#include "../net/ip.h" -#include "../net/ip_var.h" -#include "../net/pup.h" +#include "../vaxif/if_il.h" +#include "../vaxif/if_uba.h" +#include "../netinet/ip.h" +#include "../netinet/ip_var.h" +#include "../netpup/pup.h" #include "../net/route.h" #include diff --git a/usr/src/sys/vax/if/if_uba.c b/usr/src/sys/vax/if/if_uba.c index 298ff67f24..a3306cd89c 100644 --- a/usr/src/sys/vax/if/if_uba.c +++ b/usr/src/sys/vax/if/if_uba.c @@ -1,4 +1,4 @@ -/* if_uba.c 4.12 82/06/20 */ +/* if_uba.c 4.13 82/10/09 */ #include "../h/param.h" #include "../h/systm.h" @@ -12,10 +12,8 @@ #include "../h/mtpr.h" #include "../h/vmmac.h" #include "../h/socket.h" -#include "../net/in.h" -#include "../net/in_systm.h" #include "../net/if.h" -#include "../net/if_uba.h" +#include "../vaxif/if_uba.h" /* * Routines supporting UNIBUS network interfaces. diff --git a/usr/src/sys/vax/if/if_vv.c b/usr/src/sys/vax/if/if_vv.c index c5923b90b0..31e50dffc6 100644 --- a/usr/src/sys/vax/if/if_vv.c +++ b/usr/src/sys/vax/if/if_vv.c @@ -1,4 +1,4 @@ -/* if_vv.c 4.6 82/08/01 */ +/* if_vv.c 4.7 82/10/09 */ /* * Proteon 10 Meg Ring Driver. @@ -18,13 +18,15 @@ #include "../h/cpu.h" #include "../h/mtpr.h" #include "../h/vmmac.h" -#include "../net/in.h" -#include "../net/in_systm.h" +#ifdef INET +#include "../netinet/in.h" +#include "../netinet/in_systm.h" +#include "../netinet/ip.h" +#include "../netinet/ip_var.h" +#endif #include "../net/if.h" -#include "../net/if_vv.h" -#include "../net/if_uba.h" -#include "../net/ip.h" -#include "../net/ip_var.h" +#include "../vaxif/if_vv.h" +#include "../vaxif/if_uba.h" #include "../net/route.h" #include -- 2.20.1