put vax headers in their place

SCCS-vsn: sys/vax/if/if_en.c 4.69
SCCS-vsn: sys/vax/if/if_il.c 4.12
SCCS-vsn: sys/vax/if/if_uba.c 4.14
SCCS-vsn: sys/vax/if/if_vv.c 4.8

diff --git a/usr/src/sys/vax/if/if_en.c b/usr/src/sys/vax/if/if_en.c
index 8b0fb8b..0f88798 100644 (file)
--- 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.68    82/10/09        */
+/*     if_en.c 4.69    82/10/10        */

 
 #include "en.h"
 
 
 #include "en.h"
 


@@ -13,22 +13,25 @@
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"

-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
-#include "../h/enreg.h"
-#include "../h/cpu.h"
-#include "../h/mtpr.h"

 #include "../h/vmmac.h"
 #include "../h/vmmac.h"

+#include <errno.h>
+
+#include "../net/if.h"
+#include "../net/netisr.h"
+#include "../net/route.h"

 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"
 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"

-#include "../net/if.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 "../netinet/ip.h"
 #include "../netinet/ip_var.h"
 #include "../netpup/pup.h"

-#include "../net/route.h"
-#include <errno.h>
+
+#include "../vax/cpu.h"
+#include "../vax/mtpr.h"
+#include "../vaxif/if_en.h"
+#include "../vaxif/if_enreg.h"
+#include "../vaxif/if_uba.h"
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"

 
 #define        ENMTU   (1024+512)
 #define        ENMRU   (1024+512+16)           /* 16 is enough to receive trailer */
 
 #define        ENMTU   (1024+512)
 #define        ENMRU   (1024+512+16)           /* 16 is enough to receive trailer */

diff --git a/usr/src/sys/vax/if/if_il.c b/usr/src/sys/vax/if/if_il.c
index 1f03ac3..6411507 100644 (file)
--- 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.11    82/10/09        */
+/*     if_il.c 4.12    82/10/10        */

 
 #include "il.h"
 
 
 #include "il.h"
 


@@ -12,22 +12,25 @@
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"

-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
-#include "../h/ilreg.h"
-#include "../h/cpu.h"
-#include "../h/mtpr.h"

 #include "../h/vmmac.h"
 #include "../h/vmmac.h"

+#include <errno.h>
+
+#include "../net/if.h"
+#include "../net/netisr.h"
+#include "../net/route.h"

 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"
 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"

-#include "../net/if.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 "../netinet/ip.h"
 #include "../netinet/ip_var.h"
 #include "../netpup/pup.h"

-#include "../net/route.h"
-#include <errno.h>
+
+#include "../vax/cpu.h"
+#include "../vax/mtpr.h"
+#include "../vaxif/if_ilreg.h"
+#include "../vaxif/if_il.h"
+#include "../vaxif/if_uba.h"
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"

 
 #define        ILMTU   1500
 
 
 #define        ILMTU   1500
 

diff --git a/usr/src/sys/vax/if/if_uba.c b/usr/src/sys/vax/if/if_uba.c
index a3306cd..27533fd 100644 (file)
--- 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.13    82/10/09        */
+/*     if_uba.c        4.14    82/10/10        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -6,14 +6,16 @@
 #include "../h/map.h"
 #include "../h/pte.h"
 #include "../h/buf.h"
 #include "../h/map.h"
 #include "../h/pte.h"
 #include "../h/buf.h"

-#include "../h/ubareg.h"
-#include "../h/ubavar.h"

 #include "../h/cmap.h"
 #include "../h/cmap.h"

-#include "../h/mtpr.h"

 #include "../h/vmmac.h"
 #include "../h/socket.h"
 #include "../h/vmmac.h"
 #include "../h/socket.h"

+

 #include "../net/if.h"
 #include "../net/if.h"

+
+#include "../vax/mtpr.h"

 #include "../vaxif/if_uba.h"
 #include "../vaxif/if_uba.h"

+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"

 
 /*
  * Routines supporting UNIBUS network interfaces.
 
 /*
  * 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 31e50df..201fda8 100644 (file)
--- 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.7     82/10/09        */
+/*     if_vv.c 4.8     82/10/10        */

 
 /*
  * Proteon 10 Meg Ring Driver.
 
 /*
  * Proteon 10 Meg Ring Driver.


@@ -13,22 +13,22 @@
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"

-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
-#include "../h/cpu.h"
-#include "../h/mtpr.h"

 #include "../h/vmmac.h"
 #include "../h/vmmac.h"

-#ifdef INET
+#include <errno.h>
+
+#include "../net/if.h"
+#include "../net/route.h"

 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"
 #include "../netinet/ip.h"
 #include "../netinet/ip_var.h"
 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"
 #include "../netinet/ip.h"
 #include "../netinet/ip_var.h"

-#endif
-#include "../net/if.h"
+
+#include "../vax/cpu.h"
+#include "../vax/mtpr.h"

 #include "../vaxif/if_vv.h"
 #include "../vaxif/if_uba.h"
 #include "../vaxif/if_vv.h"
 #include "../vaxif/if_uba.h"

-#include "../net/route.h"
-#include <errno.h>
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"

 
 #include "vv.h"
 
 
 #include "vv.h"