first working version of BSD/tahoe ex driver; checkpoint other

[unix-history] / usr / src / sys / tahoe / if / if_enp.c

diff --git a/usr/src/sys/tahoe/if/if_enp.c b/usr/src/sys/tahoe/if/if_enp.c
index e818caa..f3da6a3 100644 (file)
--- a/usr/src/sys/tahoe/if/if_enp.c
+++ b/usr/src/sys/tahoe/if/if_enp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)if_enp.c    7.4 (Berkeley) %G%
+ *     @(#)if_enp.c    7.5 (Berkeley) %G%

  */
 
 #include "enp.h"
  */
 
 #include "enp.h"


@@ -129,7 +129,7 @@ enpattach(ui)
        ifp->if_mtu = ETHERMTU;
        ifp->if_init = enpinit;
        ifp->if_ioctl = enpioctl;
        ifp->if_mtu = ETHERMTU;
        ifp->if_init = enpinit;
        ifp->if_ioctl = enpioctl;

-       ifp->if_output = enoutput;
+       ifp->if_output = ether_output;

        ifp->if_start = enpstart;
        ifp->if_reset = enpreset;
        ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
        ifp->if_start = enpstart;
        ifp->if_reset = enpreset;
        ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;


@@ -243,7 +243,7 @@ enpread(es, bcbp)
        m = enpget((u_char *)enp, len, off, &es->es_if);
        if (m == 0)
                return;
        m = enpget((u_char *)enp, len, off, &es->es_if);
        if (m == 0)
                return;

-       en_doproto(&es->es_if, enp, m);
+       ether_input(&es->es_if, enp, m);

 }
 
 enpstart(ifp)
 }
 
 enpstart(ifp)


@@ -417,7 +417,7 @@ enpioctl(ifp, cmd, data)
 
        case SIOCSIFADDR:
                ifp->if_flags |= IFF_UP;
 
        case SIOCSIFADDR:
                ifp->if_flags |= IFF_UP;

-               switch (ifa->ifa_addr.sa_family) {
+               switch (ifa->ifa_addr->sa_family) {

 #ifdef INET
                case AF_INET:
                        enpinit(ifp->if_unit);
 #ifdef INET
                case AF_INET:
                        enpinit(ifp->if_unit);