rm bbnnet; rm PUP

SCCS-vsn: sys/net/if.c 6.11
SCCS-vsn: sys/net/if_loop.c 6.8
SCCS-vsn: sys/net/raw_cb.c 6.8

diff --git a/usr/src/sys/net/if.c b/usr/src/sys/net/if.c
index c9026c4..a410678 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.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.c        6.10 (Berkeley) %G%
+ *     @(#)if.c        6.11 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -236,7 +236,7 @@ ifioctl(so, cmd, data)
        case SIOCGIFCONF:
                return (ifconf(cmd, data));
 
        case SIOCGIFCONF:
                return (ifconf(cmd, data));
 

-#if (defined(INET) || defined(BBNNET)) && NETHER > 0
+#if defined(INET) && NETHER > 0

        case SIOCSARP:
        case SIOCDARP:
                if (!suser())
        case SIOCSARP:
        case SIOCDARP:
                if (!suser())

diff --git a/usr/src/sys/net/if_loop.c b/usr/src/sys/net/if_loop.c
index 60673f0..544dc87 100644 (file)
--- a/usr/src/sys/net/if_loop.c
+++ b/usr/src/sys/net/if_loop.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_loop.c   6.7 (Berkeley) %G%
+ *     @(#)if_loop.c   6.8 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -17,9 +17,6 @@
 #include "errno.h"
 #include "ioctl.h"
 
 #include "errno.h"
 #include "ioctl.h"
 

-#ifdef BBNNET
-#define INET
-#endif

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

diff --git a/usr/src/sys/net/raw_cb.c b/usr/src/sys/net/raw_cb.c
index 6107b38..e6af036 100644 (file)
--- a/usr/src/sys/net/raw_cb.c
+++ b/usr/src/sys/net/raw_cb.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.
  *

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

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -112,7 +112,7 @@ raw_bind(so, nam)
         */
        switch (addr->sa_family) {
 
         */
        switch (addr->sa_family) {
 

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

        case AF_IMPLINK:
        case AF_INET: {
                if (((struct sockaddr_in *)addr)->sin_addr.s_addr &&
        case AF_IMPLINK:
        case AF_INET: {
                if (((struct sockaddr_in *)addr)->sin_addr.s_addr &&


@@ -122,28 +122,6 @@ raw_bind(so, nam)
        }
 #endif
 
        }
 #endif
 

-#ifdef PUP
-       /*
-        * Curious, we convert PUP address format to internet
-        * to allow us to verify we're asking for an Ethernet
-        * interface.  This is wrong, but things are heavily
-        * oriented towards the internet addressing scheme, and
-        * converting internet to PUP would be very expensive.
-        */
-       case AF_PUP: {
-               struct sockaddr_pup *spup = (struct sockaddr_pup *)addr;
-               struct sockaddr_in inpup;
-
-               bzero((caddr_t)&inpup, (unsigned)sizeof(inpup));
-               inpup.sin_family = AF_INET;
-               inpup.sin_addr = in_makeaddr(spup->spup_net, spup->spup_host);
-               if (inpup.sin_addr.s_addr &&
-                   ifa_ifwithaddr((struct sockaddr *)&inpup) == 0)
-                       return (EADDRNOTAVAIL);
-               break;
-       }
-#endif
-

        default:
                return (EAFNOSUPPORT);
        }
        default:
                return (EAFNOSUPPORT);
        }