X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/57aa3090c610559e96e83b8585d0137f234200cd..5e35ed2481cff3093e5df1d23606e3f8ce318fba:/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 336cbc645f..6299fcb687 100644
--- a/usr/src/sys/vax/if/if_en.c
+++ b/usr/src/sys/vax/if/if_en.c
@@ -1,7 +1,6 @@
-/*	if_en.c	4.56	82/04/11	*/
+/*	if_en.c	4.71	82/10/24	*/
 
 #include "en.h"
-#include "imp.h"
 
 /*
  * Xerox prototype (3 Mb) Ethernet interface driver.
@@ -14,24 +13,28 @@
 #include "../h/buf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
-#include "../h/enreg.h"
-#include "../h/cpu.h"
-#include "../h/mtpr.h"
 #include "../h/vmmac.h"
-#include "../net/in.h"
-#include "../net/in_systm.h"
+#include <errno.h>
+
 #include "../net/if.h"
-#include "../net/if_en.h"
-#include "../net/if_uba.h"
-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/pup.h"
+#include "../net/netisr.h"
 #include "../net/route.h"
-#include <errno.h>
+#include "../netinet/in.h"
+#include "../netinet/in_systm.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netpup/pup.h"
+
+#include "../vax/cpu.h"
+#include "../vax/mtpr.h"
+#include "../vaxif/if_en.h"
+#include "../vaxif/if_enreg.h"
+#include "../vaxif/if_uba.h"
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"
 
 #define	ENMTU	(1024+512)
+#define	ENMRU	(1024+512+16)		/* 16 is enough to receive trailer */
 
 int	enprobe(), enattach(), enrint(), enxint(), encollide();
 struct	uba_device *eninfo[NEN];
@@ -74,7 +77,6 @@ enprobe(reg)
 	register int br, cvec;		/* r11, r10 value-result */
 	register struct endevice *addr = (struct endevice *)reg;
 
-COUNT(ENPROBE);
 #ifdef lint
 	br = 0; cvec = br; br = cvec;
 	enrint(0); enxint(0); encollide(0);
@@ -85,7 +87,9 @@ COUNT(ENPROBE);
 	addr->en_ostat = EN_IEN|EN_GO;
 	DELAY(100000);
 	addr->en_ostat = 0;
-	br = 0x16;		/* temporary ec hack */
+#ifdef ECHACK
+	br = 0x16;
+#endif
 	return (1);
 }
 
@@ -99,12 +103,11 @@ enattach(ui)
 {
 	register struct en_softc *es = &en_softc[ui->ui_unit];
 	register struct sockaddr_in *sin;
-COUNT(ENATTACH);
 
 	es->es_if.if_unit = ui->ui_unit;
 	es->es_if.if_name = "en";
 	es->es_if.if_mtu = ENMTU;
-	es->es_if.if_net = ui->ui_flags & 0xff;
+	es->es_if.if_net = ui->ui_flags;
 	es->es_if.if_host[0] =
 	 (~(((struct endevice *)eninfo[ui->ui_unit]->ui_addr)->en_addr)) & 0xff;
 	sin = (struct sockaddr_in *)&es->es_if.if_addr;
@@ -117,12 +120,8 @@ COUNT(ENATTACH);
 	es->es_if.if_init = eninit;
 	es->es_if.if_output = enoutput;
 	es->es_if.if_ubareset = enreset;
-	es->es_ifuba.ifu_flags = UBA_NEEDBDP | UBA_NEED16;
+	es->es_ifuba.ifu_flags = UBA_NEEDBDP | UBA_NEED16 | UBA_CANTWAIT;
 	if_attach(&es->es_if);
-#if NIMP == 0
-	/* here's one for you john baby.... */
-	enlhinit((ui->ui_flags &~ 0xff) | 0x0a);
-#endif
 }
 
 /*
@@ -133,7 +132,6 @@ enreset(unit, uban)
 	int unit, uban;
 {
 	register struct uba_device *ui;
-COUNT(ENRESET);
 
 	if (unit >= NEN || (ui = eninfo[unit]) == 0 || ui->ui_alive == 0 ||
 	    ui->ui_ubanum != uban)
@@ -155,7 +153,7 @@ eninit(unit)
 	int s;
 
 	if (if_ubainit(&es->es_ifuba, ui->ui_ubanum,
-	    sizeof (struct en_header), (int)btoc(ENMTU)) == 0) { 
+	    sizeof (struct en_header), (int)btoc(ENMRU)) == 0) { 
 		printf("en%d: can't initialize\n", unit);
 		es->es_if.if_flags &= ~IFF_UP;
 		return;
@@ -169,17 +167,17 @@ eninit(unit)
 	 */
 	s = splimp();
 	addr->en_iba = es->es_ifuba.ifu_r.ifrw_info;
-	addr->en_iwc = -(sizeof (struct en_header) + ENMTU) >> 1;
+	addr->en_iwc = -(sizeof (struct en_header) + ENMRU) >> 1;
 	addr->en_istat = EN_IEN|EN_GO;
 	es->es_oactive = 1;
 	es->es_if.if_flags |= IFF_UP;
 	enxint(unit);
 	splx(s);
-	if_rtinit(&es->es_if, RTF_DIRECT|RTF_UP);
+	if_rtinit(&es->es_if, RTF_UP);
 }
 
 int	enalldelay = 0;
-int	enlastdel = 25;
+int	enlastdel = 50;
 int	enlastmask = (~0) << 5;
 
 /*
@@ -199,7 +197,6 @@ enstart(dev)
 	register struct endevice *addr;
 	struct mbuf *m;
 	int dest;
-COUNT(ENSTART);
 
 	if (es->es_oactive)
 		goto restart;
@@ -256,14 +253,11 @@ enxint(unit)
 	register struct uba_device *ui = eninfo[unit];
 	register struct en_softc *es = &en_softc[unit];
 	register struct endevice *addr = (struct endevice *)ui->ui_addr;
-COUNT(ENXINT);
 
 	if (es->es_oactive == 0)
 		return;
 	if (es->es_mask && (addr->en_ostat&EN_OERROR)) {
 		es->es_if.if_oerrors++;
-		if (es->es_if.if_oerrors % 100 == 0)
-			printf("en%d: += 100 output errors\n", unit);
 		endocoll(unit);
 		return;
 	}
@@ -291,7 +285,6 @@ encollide(unit)
 	int unit;
 {
 	struct en_softc *es = &en_softc[unit];
-COUNT(ENCOLLIDE);
 
 	es->es_if.if_collisions++;
 	if (es->es_oactive == 0)
@@ -342,10 +335,9 @@ enrint(unit)
 	struct endevice *addr = (struct endevice *)eninfo[unit]->ui_addr;
 	register struct en_header *en;
     	struct mbuf *m;
-	int len, plen; short resid;
+	int len; short resid;
 	register struct ifqueue *inq;
 	int off;
-COUNT(ENRINT);
 
 	es->es_if.if_ipackets++;
 
@@ -356,8 +348,6 @@ COUNT(ENRINT);
 		UBAPURGE(es->es_ifuba.ifu_uba, es->es_ifuba.ifu_r.ifrw_bdp);
 	if (addr->en_istat&EN_IERROR) {
 		es->es_if.if_ierrors++;
-		if (es->es_if.if_ierrors % 100 == 0)
-			printf("en%d: += 100 input errors\n", unit);
 		goto setup;
 	}
 
@@ -371,16 +361,16 @@ COUNT(ENRINT);
 	resid = addr->en_iwc;
 	if (resid)
 		resid |= 0176000;
-	len = (((sizeof (struct en_header) + ENMTU) >> 1) + resid) << 1;
+	len = (((sizeof (struct en_header) + ENMRU) >> 1) + resid) << 1;
 	len -= sizeof (struct en_header);
-	if (len >= ENMTU)
+	if (len > ENMRU)
 		goto setup;			/* sanity */
 	en = (struct en_header *)(es->es_ifuba.ifu_r.ifrw_addr);
 #define	endataaddr(en, off, type)	((type)(((caddr_t)((en)+1)+(off))))
 	if (en->en_type >= ENPUP_TRAIL &&
 	    en->en_type < ENPUP_TRAIL+ENPUP_NTRAILER) {
 		off = (en->en_type - ENPUP_TRAIL) * 512;
-		if (off >= ENMTU)
+		if (off > ENMTU)
 			goto setup;		/* sanity */
 		en->en_type = *endataaddr(en, off, u_short *);
 		resid = *(endataaddr(en, off+2, u_short *));
@@ -440,7 +430,7 @@ setup:
 	 * Reset for next packet.
 	 */
 	addr->en_iba = es->es_ifuba.ifu_r.ifrw_info;
-	addr->en_iwc = -(sizeof (struct en_header) + ENMTU) >> 1;
+	addr->en_iwc = -(sizeof (struct en_header) + ENMRU) >> 1;
 	addr->en_istat = EN_IEN|EN_GO;
 }
 
@@ -460,7 +450,6 @@ enoutput(ifp, m0, dst)
 	register struct en_header *en;
 	register int off;
 
-COUNT(ENOUTPUT);
 	switch (dst->sa_family) {
 
 #ifdef INET
@@ -558,51 +547,3 @@ bad:
 	m_freem(m0);
 	return (error);
 }
-
-#if NIMP == 0 && NEN > 0
-/*
- * Logical host interface driver.
- * Allows host to appear as an ARPAnet
- * logical host.  Must also have routing
- * table entry set up to forward packets
- * to appropriate gateway on localnet.
- */
-
-struct	ifnet enlhif;
-int	enlhoutput();
-
-/*
- * Called by localnet interface to allow logical
- * host interface to "attach".  Nothing should ever
- * be sent locally to this interface, it's purpose
- * is simply to establish the host's arpanet address.
- */
-enlhinit(addr)
-	int addr;
-{
-	register struct ifnet *ifp = &enlhif;
-	register struct sockaddr_in *sin;
-
-COUNT(ENLHINIT);
-	ifp->if_name = "lh";
-	ifp->if_mtu = ENMTU;
-	sin = (struct sockaddr_in *)&ifp->if_addr;
-	sin->sin_family = AF_INET;
-	sin->sin_addr.s_addr = addr;
-	ifp->if_net = sin->sin_addr.s_net;
-	ifp->if_flags = IFF_UP;
-	ifp->if_output = enlhoutput;	/* should never be used */
-	if_attach(ifp);
-}
-
-enlhoutput(ifp, m0, dst)
-	struct ifnet *ifp;
-	struct mbuf *m0;
-	struct sockaddr *dst;
-{
-COUNT(ENLHOUTPUT);
-	ifp->if_oerrors++;
-	m_freem(m0);
-	return (0);
-}
-#endif