lint

SCCS-vsn: sys/kern/uipc_mbuf.c 1.18
SCCS-vsn: sys/conf/param.c 4.11
SCCS-vsn: sys/kern/uipc_proto.c 4.9
SCCS-vsn: sys/vax/vax/scb.s 4.13

diff --git a/usr/src/sys/conf/param.c b/usr/src/sys/conf/param.c
index dc82bf9..8a5e71d 100644 (file)
--- a/usr/src/sys/conf/param.c
+++ b/usr/src/sys/conf/param.c
@@ -1,4 +1,4 @@
-/*     param.c 4.10    81/11/14        */
+/*     param.c 4.11    81/11/30        */

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


@@ -34,7 +34,7 @@ int   nfile = 8 * (NPROC + 16 + MAXUSERS) / 10 + 32;
 int    ncallout = 16 + MAXUSERS;
 int    nclist = 100 + 16 * MAXUSERS;
 int    nport = NPROC / 2;
 int    ncallout = 16 + MAXUSERS;
 int    nclist = 100 + 16 * MAXUSERS;
 int    nport = NPROC / 2;

-int     nmbpages = NMBPAGES;
+int     nmbclusters = NMBCLUSTERS;

 
 /*
  * These are initialized at bootstrap time
 
 /*
  * These are initialized at bootstrap time

diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c
index 6e3fa7a..3054434 100644 (file)
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*     uipc_mbuf.c     1.17    81/11/26        */
+/*     uipc_mbuf.c     1.18    81/11/30        */

 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"


@@ -18,7 +18,7 @@ m_reserve(mbufs)
 /*
        printf("reserve %d\n", mbufs);
 */
 /*
        printf("reserve %d\n", mbufs);
 */

-       if (mbstat.m_lowat + (mbufs>>1) > (NMBPAGES-32) * CLBYTES) 
+       if (mbstat.m_lowat + (mbufs>>1) > (NMBCLUSTERS-32) * CLBYTES) 

                return (0);
        mbstat.m_hiwat += mbufs;
        mbstat.m_lowat = mbstat.m_hiwat >> 1;
                return (0);
        mbstat.m_hiwat += mbufs;
        mbstat.m_lowat = mbstat.m_hiwat >> 1;

diff --git a/usr/src/sys/kern/uipc_proto.c b/usr/src/sys/kern/uipc_proto.c
index c0e93e2..08f2c2c 100644 (file)
--- a/usr/src/sys/kern/uipc_proto.c
+++ b/usr/src/sys/kern/uipc_proto.c
@@ -1,4 +1,4 @@
-/*     uipc_proto.c    4.8     81/11/26        */
+/*     uipc_proto.c    4.9     81/11/30        */

 
 #include "../h/param.h"
 #include "../h/socket.h"
 
 #include "../h/param.h"
 #include "../h/socket.h"


@@ -31,54 +31,54 @@ int udp_init();
 int    tcp_input(),tcp_ctlinput();
 int    tcp_usrreq(),tcp_sense();
 int    tcp_init(),tcp_fasttimo(),tcp_slowtimo(),tcp_drain();
 int    tcp_input(),tcp_ctlinput();
 int    tcp_usrreq(),tcp_sense();
 int    tcp_init(),tcp_fasttimo(),tcp_slowtimo(),tcp_drain();

-int    rip_input(),rip_ctlinput();
-int    rip_usrreq(),rip_sense();
+int    rip_input(),rip_output(),rip_ctlinput();
+int    rip_usrreq(),rip_slowtimo();

 
 struct protosw protosw[] = {
 
 struct protosw protosw[] = {

-{ SOCK_STREAM, PF_LOCAL,       0,              PR_CONNREQUIRED,
+{ SOCK_STREAM, PF_UNIX,        0,              PR_CONNREQUIRED,

   0,           0,              0,              0,
   0,           0,              0,              0,

-  piusrreq,    0,              0,
+  piusrreq,

   0,           0,              0,              0,
 },
   0,           0,              0,              0,
 },

-{ SOCK_DGRAM,  PF_LOCAL,       0,              PR_ATOMIC|PR_ADDR,
+{ SOCK_DGRAM,  PF_UNIX,        0,              PR_ATOMIC|PR_ADDR,

   0,           0,              0,              0,
   0,           0,              0,              0,

-  piusrreq,    0,              0,
+  piusrreq,

   0,           0,              0,              0,
 },
   0,           0,              0,              0,
 },

-{ SOCK_RDM,    PF_LOCAL,       0,              PR_ATOMIC|PR_ADDR,
+{ SOCK_RDM,    PF_UNIX,        0,              PR_ATOMIC|PR_ADDR,

   0,           0,              0,              0,
   0,           0,              0,              0,

-  piusrreq,    0,              0,
+  piusrreq,

   0,           0,              0,              0,
 },
   0,           0,              0,              0,
 },

-{ SOCK_RAW,    PF_LOCAL,       0,              PR_ATOMIC|PR_ADDR,
+{ SOCK_RAW,    PF_UNIX,        0,              PR_ATOMIC|PR_ADDR,

   0,           0,              0,              0,
   0,           0,              0,              0,

-  piusrreq,    0,              0,
+  piusrreq,

   0,           0,              0,              0,
 },
 { 0,           0,              0,              0,
   0,           ip_output,      0,              0,
   0,           0,              0,              0,
 },
 { 0,           0,              0,              0,
   0,           ip_output,      0,              0,

-  0,           0,              0,
+  0,

   ip_init,     0,              ip_slowtimo,    ip_drain,
 },
 { 0,           0,              IPPROTO_ICMP,   0,
   icmp_input,  0,              0,              0,
   ip_init,     0,              ip_slowtimo,    ip_drain,
 },
 { 0,           0,              IPPROTO_ICMP,   0,
   icmp_input,  0,              0,              0,

-  0,           0,              0,
+  0,

   0,           0,              0,              icmp_drain,
 },
 { SOCK_DGRAM,  PF_INET,        IPPROTO_UDP,    PR_ATOMIC|PR_ADDR,
   udp_input,   0,              udp_ctlinput,   0,
   0,           0,              0,              icmp_drain,
 },
 { SOCK_DGRAM,  PF_INET,        IPPROTO_UDP,    PR_ATOMIC|PR_ADDR,
   udp_input,   0,              udp_ctlinput,   0,

-  udp_usrreq,  udp_sense,      MLEN,
+  udp_usrreq,

   udp_init,    0,              0,              0,
 },
 { SOCK_STREAM, PF_INET,        IPPROTO_TCP,    PR_CONNREQUIRED|PR_WANTRCVD,
   tcp_input,   0,              tcp_ctlinput,   0,
   udp_init,    0,              0,              0,
 },
 { SOCK_STREAM, PF_INET,        IPPROTO_TCP,    PR_CONNREQUIRED|PR_WANTRCVD,
   tcp_input,   0,              tcp_ctlinput,   0,

-  tcp_usrreq,  tcp_sense,      MLEN,
+  tcp_usrreq,

   tcp_init,    tcp_fasttimo,   tcp_slowtimo,   tcp_drain,
 },
 { SOCK_RAW,    PF_INET,        IPPROTO_RAW,    PR_ATOMIC|PR_ADDR,
   tcp_init,    tcp_fasttimo,   tcp_slowtimo,   tcp_drain,
 },
 { SOCK_RAW,    PF_INET,        IPPROTO_RAW,    PR_ATOMIC|PR_ADDR,

-  rip_input,   0,              rip_ctlinput,   0,
-  rip_usrreq,  rip_sense,      MLEN,
-  0,           0,              0,              0,
+  rip_input,   rip_output,     rip_ctlinput,   0,
+  rip_usrreq,
+  0,           0,              rip_slowtimo,   0,

 }
 };
 
 }
 };
 

diff --git a/usr/src/sys/vax/vax/scb.s b/usr/src/sys/vax/vax/scb.s
index 5f4334c..c5b3cec 100644 (file)
--- a/usr/src/sys/vax/vax/scb.s
+++ b/usr/src/sys/vax/vax/scb.s
@@ -1,4 +1,4 @@
-/*     scb.s   4.12    81/11/26        */
+/*     scb.s   4.13    81/11/30        */

 
 /*
  * System control block
 
 /*
  * System control block


@@ -27,11 +27,11 @@ _scb:       .globl  _scb
 /* 090 */      STRAY;          STRAY;          STRAY;          STRAY;
 /* 0a0 */      IS(softclock);  STRAY;          STRAY;          STRAY;
 #ifdef INET
 /* 090 */      STRAY;          STRAY;          STRAY;          STRAY;
 /* 0a0 */      IS(softclock);  STRAY;          STRAY;          STRAY;
 #ifdef INET

-/* 0b0 */      IS(ipintr);
+/* 0b0 */      IS(ipintr);     IS(rawintr);

 #else
 #else

-/* 0b0 */      STRAY;
+/* 0b0 */      STRAY;          STRAY;

 #endif
 #endif

-/* 0b4 */                      STRAY;          STRAY;          STRAY;
+/* 0b4 */                                      STRAY;          STRAY;

 /* 0c0 */      IS(hardclock);  STRAY;          STRAY;          STRAY;
 /* 0d0 */      STRAY;          STRAY;          STRAY;          STRAY;
 /* 0e0 */      STRAY;          STRAY;          STRAY;          STRAY;
 /* 0c0 */      IS(hardclock);  STRAY;          STRAY;          STRAY;
 /* 0d0 */      STRAY;          STRAY;          STRAY;          STRAY;
 /* 0e0 */      STRAY;          STRAY;          STRAY;          STRAY;