merge 4.1b with 4.1c

[unix-history] / usr / src / sys / vax / if / if_en.c

diff --git a/usr/src/sys/vax/if/if_en.c b/usr/src/sys/vax/if/if_en.c
index 6299fcb..4afefc4 100644 (file)
--- a/usr/src/sys/vax/if/if_en.c
+++ b/usr/src/sys/vax/if/if_en.c
@@ -1,4 +1,4 @@
-/*     if_en.c 4.71    82/10/24        */
+/*     if_en.c 4.72    82/11/13        */

 
 #include "en.h"
 
 
 #include "en.h"
 


@@ -119,7 +119,7 @@ enattach(ui)
        es->es_if.if_flags = IFF_BROADCAST;
        es->es_if.if_init = eninit;
        es->es_if.if_output = enoutput;
        es->es_if.if_flags = IFF_BROADCAST;
        es->es_if.if_init = eninit;
        es->es_if.if_output = enoutput;

-       es->es_if.if_ubareset = enreset;
+       es->es_if.if_reset = enreset;

        es->es_ifuba.ifu_flags = UBA_NEEDBDP | UBA_NEED16 | UBA_CANTWAIT;
        if_attach(&es->es_if);
 }
        es->es_ifuba.ifu_flags = UBA_NEEDBDP | UBA_NEED16 | UBA_CANTWAIT;
        if_attach(&es->es_if);
 }


@@ -455,7 +455,7 @@ enoutput(ifp, m0, dst)
 #ifdef INET
        case AF_INET:
                dest = ((struct sockaddr_in *)dst)->sin_addr.s_addr;
 #ifdef INET
        case AF_INET:
                dest = ((struct sockaddr_in *)dst)->sin_addr.s_addr;

-               if (dest & 0x00ffff00) {
+               if (in_lnaof(*((struct in_addr *)&dest)) >= 0x100) {

                        error = EPERM;          /* ??? */
                        goto bad;
                }
                        error = EPERM;          /* ??? */
                        goto bad;
                }