rm bbnnet

SCCS-vsn: sys/vax/if/if_ddn.c 6.3
SCCS-vsn: sys/vax/if/if_de.c 6.16
SCCS-vsn: sys/vax/if/if_dmc.c 6.8
SCCS-vsn: sys/vax/if/if_ec.c 6.15
SCCS-vsn: sys/vax/if/if_en.c 6.13
SCCS-vsn: sys/vax/if/if_ex.c 6.9
SCCS-vsn: sys/vax/if/if_hdh.c 6.3
SCCS-vsn: sys/vax/if/if_hy.c 6.7
SCCS-vsn: sys/vax/if/if_pcl.c 6.6
SCCS-vsn: sys/vax/if/if_vv.c 6.14
SCCS-vsn: sys/vax/if/raw_hy.c 6.4
SCCS-vsn: sys/conf/files 6.12
SCCS-vsn: sys/vax/conf/files.vax 6.10
SCCS-vsn: sys/vax/vax/Locore.c 6.7

diff --git a/usr/src/sys/conf/files b/usr/src/sys/conf/files
index 6395200..6acfca2 100644 (file)
--- a/usr/src/sys/conf/files
+++ b/usr/src/sys/conf/files
@@ -100,29 +100,3 @@ sys/vm_sw.c                standard
 sys/vm_swap.c          standard
 sys/vm_swp.c           standard
 sys/vm_text.c          standard
 sys/vm_swap.c          standard
 sys/vm_swp.c           standard
 sys/vm_text.c          standard

-bbnnet/icmp.c          optional bbnnet
-bbnnet/ic_output.c     optional bbnnet
-bbnnet/in.c            optional bbnnet
-bbnnet/in_pcb.c                optional bbnnet
-bbnnet/in_proto.c      optional bbnnet
-bbnnet/ip_input.c      optional bbnnet
-bbnnet/ip_output.c     optional bbnnet
-bbnnet/ip_usrreq.c     optional bbnnet
-bbnnet/raw_input.c     optional bbnnet
-bbnnet/tcp_input.c     optional bbnnet
-bbnnet/tcp_prim.c      optional bbnnet
-bbnnet/tcp_procs.c     optional bbnnet
-bbnnet/tcp_states.c    optional bbnnet
-bbnnet/tcp_usrreq.c    optional bbnnet
-bbnnet/udp_usrreq.c    optional bbnnet
-bbnnet/udp.c           optional bbnnet
-bbnnet/hmp.c           optional bbnnet hmp
-bbnnet/hmp_subr.c      optional bbnnet hmp
-bbnnet/hmp_traps.c     optional bbnnet hmp
-bbnnet/rdp_fsm.c       optional bbnnet rdp
-bbnnet/rdp_cksum.s     optional bbnnet
-bbnnet/rdp_input.c     optional bbnnet rdp
-bbnnet/rdp_prim.c      optional bbnnet rdp
-bbnnet/rdp_states.c    optional bbnnet rdp
-bbnnet/rdp_subr.c      optional bbnnet rdp
-bbnnet/rdp_usrreq.c    optional bbnnet rdp

diff --git a/usr/src/sys/vax/conf/files.vax b/usr/src/sys/vax/conf/files.vax
index 3d7d346..9f908a0 100644 (file)
--- a/usr/src/sys/vax/conf/files.vax
+++ b/usr/src/sys/vax/conf/files.vax
@@ -7,7 +7,6 @@ vax/crl.c               standard
 vax/dkbad.c            standard
 vax/flp.c              standard
 vax/in_cksum.c         optional inet
 vax/dkbad.c            standard
 vax/flp.c              standard
 vax/in_cksum.c         optional inet

-vax/in_cksum.c         optional bbnnet

 vax/ns_cksum.c         optional ns
 vax/machdep.c          standard config-dependent
 vax/mem.c              standard
 vax/ns_cksum.c         optional ns
 vax/machdep.c          standard config-dependent
 vax/mem.c              standard


@@ -31,7 +30,6 @@ vaxif/if_hy.c         optional hy device-driver
 vaxif/if_il.c          optional il device-driver
 vaxif/if_pcl.c         optional pcl device-driver
 vaxif/if_uba.c         optional inet device-driver
 vaxif/if_il.c          optional il device-driver
 vaxif/if_pcl.c         optional pcl device-driver
 vaxif/if_uba.c         optional inet device-driver

-vaxif/if_uba.c         optional bbnnet device-driver

 vaxif/if_uba.c         optional ns device-driver
 vaxif/if_ub.c          optional ub device-driver
 vaxif/if_vv.c          optional vv device-driver
 vaxif/if_uba.c         optional ns device-driver
 vaxif/if_ub.c          optional ub device-driver
 vaxif/if_vv.c          optional vv device-driver

diff --git a/usr/src/sys/vax/if/if_ddn.c b/usr/src/sys/vax/if/if_ddn.c
index acd0f52..e36f9b3 100644 (file)
--- a/usr/src/sys/vax/if/if_ddn.c
+++ b/usr/src/sys/vax/if/if_ddn.c
@@ -1,4 +1,4 @@
-/*     @(#)if_ddn.c    6.2 (Berkeley) %G% */
+/*     @(#)if_ddn.c    6.3 (Berkeley) %G% */

 
 
 /************************************************************************\
 
 
 /************************************************************************\


@@ -79,9 +79,6 @@ Revision History:
 #include "../net/netisr.h"
 #include "../net/route.h"
 
 #include "../net/netisr.h"
 #include "../net/route.h"
 

-#ifdef BBNNET
-#define        INET
-#endif

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

diff --git a/usr/src/sys/vax/if/if_de.c b/usr/src/sys/vax/if/if_de.c
index 058ed2b..0f7a884 100644 (file)
--- a/usr/src/sys/vax/if/if_de.c
+++ b/usr/src/sys/vax/if/if_de.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)if_de.c     6.15 (Berkeley) %G%
+ *     @(#)if_de.c     6.16 (Berkeley) %G%

  */
 #include "de.h"
 #if NDE > 0
  */
 #include "de.h"
 #if NDE > 0


@@ -34,9 +34,6 @@
 #include "../net/netisr.h"
 #include "../net/route.h"
 
 #include "../net/netisr.h"
 #include "../net/route.h"
 

-#ifdef BBNNET
-#define        INET
-#endif

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

diff --git a/usr/src/sys/vax/if/if_dmc.c b/usr/src/sys/vax/if/if_dmc.c
index 36b0880..85f677e 100644 (file)
--- a/usr/src/sys/vax/if/if_dmc.c
+++ b/usr/src/sys/vax/if/if_dmc.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)if_dmc.c    6.7 (Berkeley) %G%
+ *     @(#)if_dmc.c    6.8 (Berkeley) %G%

  */
 
 #include "dmc.h"
  */
 
 #include "dmc.h"

diff --git a/usr/src/sys/vax/if/if_ec.c b/usr/src/sys/vax/if/if_ec.c
index 57d5d8a..8c9fec3 100644 (file)
--- a/usr/src/sys/vax/if/if_ec.c
+++ b/usr/src/sys/vax/if/if_ec.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)if_ec.c     6.14 (Berkeley) %G%
+ *     @(#)if_ec.c     6.15 (Berkeley) %G%

  */
 
 #include "ec.h"
  */
 
 #include "ec.h"


@@ -29,9 +29,6 @@
 #include "../net/netisr.h"
 #include "../net/route.h"
 
 #include "../net/netisr.h"
 #include "../net/route.h"
 

-#ifdef BBNNET
-#define        INET
-#endif

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

diff --git a/usr/src/sys/vax/if/if_en.c b/usr/src/sys/vax/if/if_en.c
index 119bb4b..e16c8c5 100644 (file)
--- a/usr/src/sys/vax/if/if_en.c
+++ b/usr/src/sys/vax/if/if_en.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)if_en.c     6.12 (Berkeley) %G%
+ *     @(#)if_en.c     6.13 (Berkeley) %G%

  */
 
 #include "en.h"
  */
 
 #include "en.h"


@@ -28,9 +28,6 @@
 #include "../net/netisr.h"
 #include "../net/route.h"
 
 #include "../net/netisr.h"
 #include "../net/route.h"
 

-#ifdef BBNNET
-#define        INET
-#endif

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

diff --git a/usr/src/sys/vax/if/if_ex.c b/usr/src/sys/vax/if/if_ex.c
index 520f8d3..6af01bb 100644 (file)
--- a/usr/src/sys/vax/if/if_ex.c
+++ b/usr/src/sys/vax/if/if_ex.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)if_ex.c     6.8 (Berkeley) %G%
+ *     @(#)if_ex.c     6.9 (Berkeley) %G%

  */
 
 
  */
 
 


@@ -33,9 +33,6 @@
 #include "../net/netisr.h"
 #include "../net/route.h"
 
 #include "../net/netisr.h"
 #include "../net/route.h"
 

-#ifdef BBNNET
-#define        INET
-#endif

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

diff --git a/usr/src/sys/vax/if/if_hdh.c b/usr/src/sys/vax/if/if_hdh.c
index fbf4c00..7896160 100644 (file)
--- a/usr/src/sys/vax/if/if_hdh.c
+++ b/usr/src/sys/vax/if/if_hdh.c
@@ -1,4 +1,4 @@
-/*     @(#)if_hdh.c    6.2 (Berkeley) %G% */
+/*     @(#)if_hdh.c    6.3 (Berkeley) %G% */

 
 
 /************************************************************************\
 
 
 /************************************************************************\

diff --git a/usr/src/sys/vax/if/if_hy.c b/usr/src/sys/vax/if/if_hy.c
index c326cc5..f2740f8 100644 (file)
--- a/usr/src/sys/vax/if/if_hy.c
+++ b/usr/src/sys/vax/if/if_hy.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)if_hy.c     6.6 (Berkeley) %G%
+ *     @(#)if_hy.c     6.7 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -90,9 +90,6 @@
 #include "../net/netisr.h"
 #include "../net/route.h"
 
 #include "../net/netisr.h"
 #include "../net/route.h"
 

-#ifdef BBNNET
-#define        INET
-#endif

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

diff --git a/usr/src/sys/vax/if/if_pcl.c b/usr/src/sys/vax/if/if_pcl.c
index 2e13d55..dd62f71 100644 (file)
--- a/usr/src/sys/vax/if/if_pcl.c
+++ b/usr/src/sys/vax/if/if_pcl.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)if_pcl.c    6.5 (Berkeley) %G%
+ *     @(#)if_pcl.c    6.6 (Berkeley) %G%

  */
 
 #include "pcl.h"
  */
 
 #include "pcl.h"


@@ -29,9 +29,6 @@
 #include "../net/netisr.h"
 #include "../net/route.h"
 
 #include "../net/netisr.h"
 #include "../net/route.h"
 

-#ifdef BBNNET
-#define        INET
-#endif

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

diff --git a/usr/src/sys/vax/if/if_vv.c b/usr/src/sys/vax/if/if_vv.c
index cefaa57..f2757c0 100644 (file)
--- a/usr/src/sys/vax/if/if_vv.c
+++ b/usr/src/sys/vax/if/if_vv.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)if_vv.c     6.13 (Berkeley) %G%
+ *     @(#)if_vv.c     6.14 (Berkeley) %G%

  */
 
 #include "vv.h"
  */
 
 #include "vv.h"


@@ -50,9 +50,6 @@
 #include "../net/netisr.h"
 #include "../net/route.h"
 
 #include "../net/netisr.h"
 #include "../net/route.h"
 

-#ifdef BBNNET
-#define        INET
-#endif

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

diff --git a/usr/src/sys/vax/if/raw_hy.c b/usr/src/sys/vax/if/raw_hy.c
index 2555af5..f9b0ade 100644 (file)
--- a/usr/src/sys/vax/if/raw_hy.c
+++ b/usr/src/sys/vax/if/raw_hy.c
@@ -1,5 +1,5 @@
 /*
 /*

- *     @(#)raw_hy.c    6.3     %G%
+ *     @(#)raw_hy.c    6.4     %G%

  *
  * 4.3 BSD Unix kernel - NSC HYPERchannel support
  *
  *
  * 4.3 BSD Unix kernel - NSC HYPERchannel support
  *


@@ -25,9 +25,6 @@
 #include "../net/route.h"
 #include "../net/raw_cb.h"
 
 #include "../net/route.h"
 #include "../net/raw_cb.h"
 

-#ifdef BBNNET
-#define        INET
-#endif

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

diff --git a/usr/src/sys/vax/vax/Locore.c b/usr/src/sys/vax/vax/Locore.c
index 15a43b1..7159f51 100644 (file)
--- a/usr/src/sys/vax/vax/Locore.c
+++ b/usr/src/sys/vax/vax/Locore.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)Locore.c    6.6 (Berkeley) %G%
+ *     @(#)Locore.c    6.7 (Berkeley) %G%

  */
 
 #include "dz.h"
  */
 
 #include "dz.h"


@@ -74,7 +74,7 @@ lowinit()
 #ifdef PUP
        extern struct domain pupdomain;
 #endif
 #ifdef PUP
        extern struct domain pupdomain;
 #endif

-#if defined(INET) || defined(BBNNET)
+#ifdef INET

        extern struct domain inetdomain;
 #endif
 #include "imp.h"
        extern struct domain inetdomain;
 #endif
 #include "imp.h"


@@ -92,7 +92,7 @@ lowinit()
        pupdomain.dom_next = domains;
        domains = &pupdomain;
 #endif
        pupdomain.dom_next = domains;
        domains = &pupdomain;
 #endif

-#if defined(INET) || defined(BBNNET)
+#ifdef INET

        inetdomain.dom_next = domains;
        domains = &inetdomain;
 #endif
        inetdomain.dom_next = domains;
        domains = &inetdomain;
 #endif


@@ -147,7 +147,7 @@ lowinit()
        trap(0, 0, (unsigned)0, 0, 0);
        syscall(0, 0, (unsigned)0, 0, 0);
        rawintr();
        trap(0, 0, (unsigned)0, 0, 0);
        syscall(0, 0, (unsigned)0, 0, 0);
        rawintr();

-#if defined(INET) || defined(BBNNET)
+#ifdef INET

        ipintr();
 #endif
 #ifdef NS
        ipintr();
 #endif
 #ifdef NS