localize header files

SCCS-vsn: sys/net/if_loop.c 4.14
SCCS-vsn: sys/netinet/in.c 4.4
SCCS-vsn: sys/vax/vax/in_cksum.c 1.13
SCCS-vsn: sys/deprecated/netpup/pup.c 4.3
SCCS-vsn: sys/netinet/in_pcb.c 4.32
SCCS-vsn: sys/deprecated/netpup/raw_pup.c 4.14
SCCS-vsn: sys/netinet/in_systm.h 4.14
SCCS-vsn: sys/netinet/ip_icmp.c 4.19
SCCS-vsn: sys/netinet/ip_input.c 1.51
SCCS-vsn: sys/netinet/ip_output.c 1.36
SCCS-vsn: sys/deprecated/netimp/raw_imp.c 4.13
SCCS-vsn: sys/netinet/raw_ip.c 4.14
SCCS-vsn: sys/netinet/tcp_debug.c 4.5
SCCS-vsn: sys/netinet/tcp_input.c 1.76
SCCS-vsn: sys/netinet/tcp_output.c 4.46
SCCS-vsn: sys/netinet/tcp_subr.c 4.30
SCCS-vsn: sys/netinet/tcp_timer.c 4.26

diff --git a/usr/src/sys/deprecated/netimp/raw_imp.c b/usr/src/sys/deprecated/netimp/raw_imp.c
index fae6ccc..02b7532 100644 (file)
--- a/usr/src/sys/deprecated/netimp/raw_imp.c
+++ b/usr/src/sys/deprecated/netimp/raw_imp.c
@@ -1,14 +1,14 @@
-/*     raw_imp.c       4.12    82/06/20        */
+/*     raw_imp.c       4.13    82/10/09        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/socket.h"
 #include "../h/protosw.h"
 #include "../h/socketvar.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/socket.h"
 #include "../h/protosw.h"
 #include "../h/socketvar.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.h"

-#include "../net/if_imp.h"
+#include "../netimp/if_imp.h"

 #include "../net/raw_cb.h"
 #include <errno.h>
 
 #include "../net/raw_cb.h"
 #include <errno.h>
 

diff --git a/usr/src/sys/deprecated/netpup/pup.c b/usr/src/sys/deprecated/netpup/pup.c
index df6a1a1..316fe61 100644 (file)
--- a/usr/src/sys/deprecated/netpup/pup.c
+++ b/usr/src/sys/deprecated/netpup/pup.c
@@ -1,20 +1,19 @@
-/*     pup.c   4.2     82/06/20        */
+/*     pup.c   4.3     82/10/09        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"

-#include "../net/in.h"
-#include "../net/in_systm.h"

 #include "../net/af.h"
 #include "../net/af.h"

-#include "../net/pup.h"
+#include "../netpup/pup.h"

 
 #ifdef PUP
 pup_hash(spup, hp)
        struct sockaddr_pup *spup;
        struct afhash *hp;
 {
 
 #ifdef PUP
 pup_hash(spup, hp)
        struct sockaddr_pup *spup;
        struct afhash *hp;
 {

+

        hp->afh_nethash = spup->spup_addr.pp_net;
        hp->afh_hosthash = spup->spup_addr.pp_host;
        if (hp->afh_hosthash < 0)
        hp->afh_nethash = spup->spup_addr.pp_net;
        hp->afh_hosthash = spup->spup_addr.pp_host;
        if (hp->afh_hosthash < 0)


@@ -24,6 +23,7 @@ pup_hash(spup, hp)
 pup_netmatch(spup1, spup2)
        struct sockaddr_pup *spup1, *spup2;
 {
 pup_netmatch(spup1, spup2)
        struct sockaddr_pup *spup1, *spup2;
 {

+

        return (spup1->spup_addr.pp_net == spup2->spup_addr.pp_net);
 }
 #endif
        return (spup1->spup_addr.pp_net == spup2->spup_addr.pp_net);
 }
 #endif

diff --git a/usr/src/sys/deprecated/netpup/raw_pup.c b/usr/src/sys/deprecated/netpup/raw_pup.c
index a396fa3..455e1ae 100644 (file)
--- a/usr/src/sys/deprecated/netpup/raw_pup.c
+++ b/usr/src/sys/deprecated/netpup/raw_pup.c
@@ -1,13 +1,11 @@
-/*     raw_pup.c       4.13    82/06/26        */
+/*     raw_pup.c       4.14    82/10/09        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/socket.h"
 #include "../h/protosw.h"
 #include "../h/socketvar.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/socket.h"
 #include "../h/protosw.h"
 #include "../h/socketvar.h"

-#include "../net/in.h"
-#include "../net/in_systm.h"
-#include "../net/pup.h"
+#include "../netpup/pup.h"

 #include "../net/raw_cb.h"
 #include "../net/if.h"
 #include <errno.h>
 #include "../net/raw_cb.h"
 #include "../net/if.h"
 #include <errno.h>

diff --git a/usr/src/sys/net/if_loop.c b/usr/src/sys/net/if_loop.c
index c2a4236..a54d2c4 100644 (file)
--- a/usr/src/sys/net/if_loop.c
+++ b/usr/src/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*     if_loop.c       4.13    82/06/20        */
+/*     if_loop.c       4.14    82/10/09        */

 
 /*
  * Loopback interface driver for protocol testing and timing.
 
 /*
  * Loopback interface driver for protocol testing and timing.


@@ -8,11 +8,12 @@
 #include "../h/systm.h"
 #include "../h/mbuf.h"
 #include "../h/socket.h"
 #include "../h/systm.h"
 #include "../h/mbuf.h"
 #include "../h/socket.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.h"

-#include "../net/ip.h"
-#include "../net/ip_var.h"
+#include "../net/netisr.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"

 #include "../h/mtpr.h"
 #include "../net/route.h"
 #include <errno.h>
 #include "../h/mtpr.h"
 #include "../net/route.h"
 #include <errno.h>

diff --git a/usr/src/sys/netinet/in.c b/usr/src/sys/netinet/in.c
index 89858fd..9efc277 100644 (file)
--- a/usr/src/sys/netinet/in.c
+++ b/usr/src/sys/netinet/in.c
@@ -1,12 +1,12 @@
-/*     in.c    4.3     82/06/20        */
+/*     in.c    4.4     82/10/09        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.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/route.h"
 #include "../net/af.h"
 #include "../net/if.h"
 #include "../net/route.h"
 #include "../net/af.h"

diff --git a/usr/src/sys/netinet/in_pcb.c b/usr/src/sys/netinet/in_pcb.c
index 513ac48..689cb62 100644 (file)
--- a/usr/src/sys/netinet/in_pcb.c
+++ b/usr/src/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*     in_pcb.c        4.31    82/09/26        */
+/*     in_pcb.c        4.32    82/10/09        */

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


@@ -7,11 +7,11 @@
 #include "../h/mbuf.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/mbuf.h"
 #include "../h/socket.h"
 #include "../h/socketvar.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/route.h"
 #include "../net/if.h"
 #include "../net/route.h"

-#include "../net/in_pcb.h"
+#include "../netinet/in_pcb.h"

 #include "../h/protosw.h"
 
 struct in_addr zeroin_addr;
 #include "../h/protosw.h"
 
 struct in_addr zeroin_addr;

diff --git a/usr/src/sys/netinet/in_systm.h b/usr/src/sys/netinet/in_systm.h
index 110c47f..355cff4 100644 (file)
--- a/usr/src/sys/netinet/in_systm.h
+++ b/usr/src/sys/netinet/in_systm.h
@@ -1,4 +1,4 @@
-/*     in_systm.h      4.13    82/06/24        */
+/*     in_systm.h      4.14    82/10/09        */

 
 /*
  * Miscellaneous internetwork
 
 /*
  * Miscellaneous internetwork


@@ -20,31 +20,8 @@ typedef u_long       n_long;                 /* long as received from the net */
 typedef        u_long  n_time;                 /* ms since 00:00 GMT, byte rev */
 #endif
 
 typedef        u_long  n_time;                 /* ms since 00:00 GMT, byte rev */
 #endif
 

-/*
- * The internet code runs off software interrupts.
- *
- * You can switch into the network by doing splnet() and return by splx().
- * The software interrupt level for the network is higher than the software
- * level for the clock (so you can enter the network in routines called
- * at timeout time).
- */
-#define        setsoftnet()    mtpr(SIRR, 12)
-
-/*
- * Each ``pup-level-1'' input queue has a bit in a ``netisr'' status
- * word which is used to de-multiplex a single software
- * interrupt used for scheduling the network code to calls
- * on the lowest level routine of each protocol.
- */
-#define        NETISR_RAW      0               /* same as AF_UNSPEC */
-#define        NETISR_IP       2               /* same as AF_INET */
-#define        NETISR_NS       6               /* same as AF_NS */
-
-#define        schednetisr(anisr)      { netisr |= 1<<(anisr); setsoftnet(); }
-

 #ifndef LOCORE
 #ifdef KERNEL
 #ifndef LOCORE
 #ifdef KERNEL

-int    netisr;                         /* scheduling bits for network */

 n_time iptime();
 #endif
 #endif
 n_time iptime();
 #endif
 #endif

diff --git a/usr/src/sys/netinet/ip_icmp.c b/usr/src/sys/netinet/ip_icmp.c
index 705526b..63ec273 100644 (file)
--- a/usr/src/sys/netinet/ip_icmp.c
+++ b/usr/src/sys/netinet/ip_icmp.c
@@ -1,14 +1,14 @@
-/*     ip_icmp.c       4.18    82/09/12        */
+/*     ip_icmp.c       4.19    82/10/09        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"

-#include "../net/in.h"
-#include "../net/in_systm.h"
-#include "../net/ip.h"
-#include "../net/ip_icmp.h"
+#include "../netinet/in.h"
+#include "../netinet/in_systm.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_icmp.h"

 #include <time.h>
 #include "../h/kernel.h"
 
 #include <time.h>
 #include "../h/kernel.h"
 

diff --git a/usr/src/sys/netinet/ip_input.c b/usr/src/sys/netinet/ip_input.c
index bb78cf0..cf9864f 100644 (file)
--- a/usr/src/sys/netinet/ip_input.c
+++ b/usr/src/sys/netinet/ip_input.c
@@ -1,17 +1,17 @@
-/*     ip_input.c      1.50    82/10/05        */
+/*     ip_input.c      1.51    82/10/09        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.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.h"

-#include "../net/ip.h"                 /* belongs before in.h */
-#include "../net/ip_var.h"
-#include "../net/ip_icmp.h"
-#include "../net/tcp.h"
+#include "../netinet/ip.h"                     /* belongs before in.h */
+#include "../netinet/ip_var.h"
+#include "../netinet/ip_icmp.h"
+#include "../netinet/tcp.h"

 #include <time.h>
 #include "../h/kernel.h"
 #include <errno.h>
 #include <time.h>
 #include "../h/kernel.h"
 #include <errno.h>

diff --git a/usr/src/sys/netinet/ip_output.c b/usr/src/sys/netinet/ip_output.c
index ca9f70b..0ec8574 100644 (file)
--- a/usr/src/sys/netinet/ip_output.c
+++ b/usr/src/sys/netinet/ip_output.c
@@ -1,15 +1,15 @@
-/*     ip_output.c     1.35    82/06/20        */
+/*     ip_output.c     1.36    82/10/09        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/mtpr.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/mtpr.h"
 #include "../h/socket.h"
 #include "../h/socketvar.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.h"

-#include "../net/ip.h"
-#include "../net/ip_var.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"

 #include "../net/route.h"
 #include <errno.h>
 
 #include "../net/route.h"
 #include <errno.h>
 

diff --git a/usr/src/sys/netinet/raw_ip.c b/usr/src/sys/netinet/raw_ip.c
index 366a8a0..c2bd19e 100644 (file)
--- a/usr/src/sys/netinet/raw_ip.c
+++ b/usr/src/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/*     raw_ip.c        4.13    82/06/20        */
+/*     raw_ip.c        4.14    82/10/09        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -6,10 +6,10 @@
 #include "../h/protosw.h"
 #include "../h/socketvar.h"
 #include "../net/if.h"
 #include "../h/protosw.h"
 #include "../h/socketvar.h"
 #include "../net/if.h"

-#include "../net/in.h"
-#include "../net/in_systm.h"
-#include "../net/ip.h"
-#include "../net/ip_var.h"
+#include "../netinet/in.h"
+#include "../netinet/in_systm.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"

 #include "../net/raw_cb.h"
 #include "../net/route.h"
 #include <errno.h>
 #include "../net/raw_cb.h"
 #include "../net/route.h"
 #include <errno.h>

diff --git a/usr/src/sys/netinet/tcp_debug.c b/usr/src/sys/netinet/tcp_debug.c
index 229b11c..b323f34 100644 (file)
--- a/usr/src/sys/netinet/tcp_debug.c
+++ b/usr/src/sys/netinet/tcp_debug.c
@@ -1,4 +1,4 @@
-/*     tcp_debug.c     4.4     82/06/26        */
+/*     tcp_debug.c     4.5     82/10/09        */

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


@@ -7,23 +7,23 @@
 #include "../h/socketvar.h"
 #define PRUREQUESTS
 #include "../h/protosw.h"
 #include "../h/socketvar.h"
 #define PRUREQUESTS
 #include "../h/protosw.h"

-#include "../net/in.h"
+#include "../netinet/in.h"

 #include "../net/route.h"
 #include "../net/route.h"

-#include "../net/in_pcb.h"
-#include "../net/in_systm.h"
+#include "../netinet/in_pcb.h"
+#include "../netinet/in_systm.h"

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

-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/tcp.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netinet/tcp.h"

 #define TCPSTATES
 #define TCPSTATES

-#include "../net/tcp_fsm.h"
-#include "../net/tcp_seq.h"
+#include "../netinet/tcp_fsm.h"
+#include "../netinet/tcp_seq.h"

 #define        TCPTIMERS
 #define        TCPTIMERS

-#include "../net/tcp_timer.h"
-#include "../net/tcp_var.h"
-#include "../net/tcpip.h"
+#include "../netinet/tcp_timer.h"
+#include "../netinet/tcp_var.h"
+#include "../netinet/tcpip.h"

 #define        TANAMES
 #define        TANAMES

-#include "../net/tcp_debug.h"
+#include "../netinet/tcp_debug.h"

 #include <errno.h>
 
 int    tcpconsdebug = 0;
 #include <errno.h>
 
 int    tcpconsdebug = 0;

diff --git a/usr/src/sys/netinet/tcp_input.c b/usr/src/sys/netinet/tcp_input.c
index 34476e6..64c1e62 100644 (file)
--- a/usr/src/sys/netinet/tcp_input.c
+++ b/usr/src/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*     tcp_input.c     1.75    82/10/05        */
+/*     tcp_input.c     1.76    82/10/09        */

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


@@ -6,20 +6,20 @@
 #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/in.h"
+#include "../netinet/in.h"

 #include "../net/route.h"
 #include "../net/route.h"

-#include "../net/in_pcb.h"
-#include "../net/in_systm.h"
+#include "../netinet/in_pcb.h"
+#include "../netinet/in_systm.h"

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

-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/tcp.h"
-#include "../net/tcp_fsm.h"
-#include "../net/tcp_seq.h"
-#include "../net/tcp_timer.h"
-#include "../net/tcp_var.h"
-#include "../net/tcpip.h"
-#include "../net/tcp_debug.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netinet/tcp.h"
+#include "../netinet/tcp_fsm.h"
+#include "../netinet/tcp_seq.h"
+#include "../netinet/tcp_timer.h"
+#include "../netinet/tcp_var.h"
+#include "../netinet/tcpip.h"
+#include "../netinet/tcp_debug.h"

 #include <errno.h>
 
 int    tcpprintfs = 0;
 #include <errno.h>
 
 int    tcpprintfs = 0;

diff --git a/usr/src/sys/netinet/tcp_output.c b/usr/src/sys/netinet/tcp_output.c
index 3fc990b..b166b98 100644 (file)
--- a/usr/src/sys/netinet/tcp_output.c
+++ b/usr/src/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/*     tcp_output.c    4.45    82/10/05        */
+/*     tcp_output.c    4.46    82/10/09        */

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


@@ -6,20 +6,20 @@
 #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/in.h"
+#include "../netinet/in.h"

 #include "../net/route.h"
 #include "../net/route.h"

-#include "../net/in_pcb.h"
-#include "../net/in_systm.h"
-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/tcp.h"
+#include "../netinet/in_pcb.h"
+#include "../netinet/in_systm.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netinet/tcp.h"

 #define        TCPOUTFLAGS
 #define        TCPOUTFLAGS

-#include "../net/tcp_fsm.h"
-#include "../net/tcp_seq.h"
-#include "../net/tcp_timer.h"
-#include "../net/tcp_var.h"
-#include "../net/tcpip.h"
-#include "../net/tcp_debug.h"
+#include "../netinet/tcp_fsm.h"
+#include "../netinet/tcp_seq.h"
+#include "../netinet/tcp_timer.h"
+#include "../netinet/tcp_var.h"
+#include "../netinet/tcpip.h"
+#include "../netinet/tcp_debug.h"

 #include <errno.h>
 
 char *tcpstates[]; /* XXX */
 #include <errno.h>
 
 char *tcpstates[]; /* XXX */

diff --git a/usr/src/sys/netinet/tcp_subr.c b/usr/src/sys/netinet/tcp_subr.c
index 4629c6f..766a596 100644 (file)
--- a/usr/src/sys/netinet/tcp_subr.c
+++ b/usr/src/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*     tcp_subr.c      4.29    82/10/05        */
+/*     tcp_subr.c      4.30    82/10/09        */

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


@@ -6,20 +6,20 @@
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"

-#include "../net/in.h"
+#include "../netinet/in.h"

 #include "../net/route.h"
 #include "../net/route.h"

-#include "../net/in_pcb.h"
-#include "../net/in_systm.h"
+#include "../netinet/in_pcb.h"
+#include "../netinet/in_systm.h"

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

-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/ip_icmp.h"
-#include "../net/tcp.h"
-#include "../net/tcp_fsm.h"
-#include "../net/tcp_seq.h"
-#include "../net/tcp_timer.h"
-#include "../net/tcp_var.h"
-#include "../net/tcpip.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netinet/ip_icmp.h"
+#include "../netinet/tcp.h"
+#include "../netinet/tcp_fsm.h"
+#include "../netinet/tcp_seq.h"
+#include "../netinet/tcp_timer.h"
+#include "../netinet/tcp_var.h"
+#include "../netinet/tcpip.h"

 #include <errno.h>
 
 /*
 #include <errno.h>
 
 /*

diff --git a/usr/src/sys/netinet/tcp_timer.c b/usr/src/sys/netinet/tcp_timer.c
index 19cbf04..90b0a46 100644 (file)
--- a/usr/src/sys/netinet/tcp_timer.c
+++ b/usr/src/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/*     tcp_timer.c     4.25    82/10/05        */
+/*     tcp_timer.c     4.26    82/10/09        */

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


@@ -6,19 +6,19 @@
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"

-#include "../net/in.h"
+#include "../netinet/in.h"

 #include "../net/route.h"
 #include "../net/route.h"

-#include "../net/in_pcb.h"
-#include "../net/in_systm.h"
+#include "../netinet/in_pcb.h"
+#include "../netinet/in_systm.h"

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

-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/tcp.h"
-#include "../net/tcp_fsm.h"
-#include "../net/tcp_seq.h"
-#include "../net/tcp_timer.h"
-#include "../net/tcp_var.h"
-#include "../net/tcpip.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netinet/tcp.h"
+#include "../netinet/tcp_fsm.h"
+#include "../netinet/tcp_seq.h"
+#include "../netinet/tcp_timer.h"
+#include "../netinet/tcp_var.h"
+#include "../netinet/tcpip.h"

 #include <errno.h>
 
 int    tcpnodelack = 0;
 #include <errno.h>
 
 int    tcpnodelack = 0;

diff --git a/usr/src/sys/vax/vax/in_cksum.c b/usr/src/sys/vax/vax/in_cksum.c
index 027c265..55f2727 100644 (file)
--- a/usr/src/sys/vax/vax/in_cksum.c
+++ b/usr/src/sys/vax/vax/in_cksum.c
@@ -1,9 +1,9 @@
-/* in_cksum.c 1.12 82/06/20 */
+/* in_cksum.c 1.13 82/10/09 */

 
 #include <sys/types.h>
 #include "../h/mbuf.h"
 
 #include <sys/types.h>
 #include "../h/mbuf.h"

-#include "../net/in.h"
-#include "../net/in_systm.h"
+#include "../netinet/in.h"
+#include "../netinet/in_systm.h"

 
 /*
  * Checksum routine for Internet Protocol family headers.
 
 /*
  * Checksum routine for Internet Protocol family headers.