before carry to arpavax

SCCS-vsn: sys/kern/uipc_syscalls.c 4.9
SCCS-vsn: sys/vax/vax/locore.s 4.57

diff --git a/usr/src/sys/kern/uipc_syscalls.c b/usr/src/sys/kern/uipc_syscalls.c
index 6595e9e..dc86e9e 100644 (file)
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*     uipc_syscalls.c 4.8     81/11/21        */
+/*     uipc_syscalls.c 4.9     81/11/26        */

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


@@ -12,8 +12,8 @@
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"

-#include "../net/inet.h"
-#include "../net/inet_systm.h"
+#include "../net/in.h"
+#include "../net/in_systm.h"

 
 /*
  * Socket system call interface.
 
 /*
  * Socket system call interface.

diff --git a/usr/src/sys/vax/vax/locore.s b/usr/src/sys/vax/vax/locore.s
index af229e0..fed1c85 100644 (file)
--- a/usr/src/sys/vax/vax/locore.s
+++ b/usr/src/sys/vax/vax/locore.s
@@ -1,4 +1,4 @@
-/*     locore.s        4.56    81/11/08        */
+/*     locore.s        4.57    81/11/26        */

 
 #include "../h/mtpr.h"
 #include "../h/trap.h"
 
 #include "../h/mtpr.h"
 #include "../h/trap.h"


@@ -170,9 +170,9 @@ SCBVEC(softclock):
        POPR; 
        rei
 #ifdef INET
        POPR; 
        rei
 #ifdef INET

-SCBVEC(netintr):
+SCBVEC(ipintr):

        PUSHR
        PUSHR

-       calls $0,_netintr
+       calls $0,_ipintr

        POPR
        rei
 #endif
        POPR
        rei
 #endif