Remove repeated ethernet constants; use if_ether.h for it instead.

6 files changed, 6 insertions, 28 deletions

diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index bbfb6d5642c..1ebaf99fdda 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ed.c,v 1.42 2001/02/20 19:39:39 mickey Exp $	*/
+/*	$OpenBSD: if_ed.c,v 1.43 2001/06/23 21:54:47 fgsch Exp $	*/
 /*	$NetBSD: if_ed.c,v 1.105 1996/10/21 22:40:45 thorpej Exp $	*/
 
 /*
@@ -163,10 +163,6 @@ struct cfdriver ed_cd = {
 	NULL, "ed", DV_IFNET
 };
 
-#define	ETHER_MIN_LEN	64
-#define ETHER_MAX_LEN	1518
-#define	ETHER_ADDR_LEN	6
-
 #define	NIC_PUT(t, bah, nic, reg, val)	\
 	bus_space_write_1((t), (bah), ((nic) + (reg)), (val))
 #define	NIC_GET(t, bah, nic, reg)	\
diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c
index fa76958d17c..9762d802b09 100644
--- a/sys/dev/isa/if_ef_isapnp.c
+++ b/sys/dev/isa/if_ef_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ef_isapnp.c,v 1.10 2001/02/20 19:39:41 mickey Exp $	*/
+/*	$OpenBSD: if_ef_isapnp.c,v 1.11 2001/06/23 21:54:48 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -90,10 +90,6 @@ struct ef_softc {
 	int			sc_busmaster;
 };
 
-#define	ETHER_MIN_LEN		64
-#define	ETHER_MAX_LEN		1518
-#define	ETHER_ADDR_LEN		6
-
 #define	EF_W0_EEPROM_COMMAND	0x200a
 #define    EF_EEPROM_BUSY	(1 << 9)
 #define    EF_EEPROM_READ	(1 << 7)
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index fa97ef51f74..d21ffad6a85 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_eg.c,v 1.18 2001/04/06 08:04:05 fgsch Exp $	*/
+/*	$OpenBSD: if_eg.c,v 1.19 2001/06/23 21:54:49 fgsch Exp $	*/
 /*	$NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $	*/
 
 /*
@@ -84,10 +84,6 @@
 #define dprintf(x)
 #endif
 
-#define ETHER_MIN_LEN	64
-#define ETHER_MAX_LEN	1518
-#define ETHER_ADDR_LEN	6
-
 #define EG_INLEN  	10
 #define EG_BUFLEN	0x0670
 
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 317d045e8f9..0701018b504 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_el.c,v 1.13 2001/02/20 19:39:40 mickey Exp $       */
+/*    $OpenBSD: if_el.c,v 1.14 2001/06/23 21:54:49 fgsch Exp $       */
 /*	$NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $	*/
 
 /*
@@ -54,10 +54,6 @@
 #include <dev/isa/isavar.h>
 #include <dev/isa/if_elreg.h>
 
-#define ETHER_MIN_LEN	64
-#define ETHER_MAX_LEN	1518
-#define	ETHER_ADDR_LEN	6
-
 /* for debugging convenience */
 #ifdef EL_DEBUG
 #define dprintf(x) printf x
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index 892983c055b..6ae43f97751 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fe.c,v 1.13 2001/02/20 19:39:40 mickey Exp $	*/
+/*	$OpenBSD: if_fe.c,v 1.14 2001/06/23 21:54:50 fgsch Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -236,8 +236,6 @@ struct cfdriver fe_cd = {
 /* Ethernet constants.  To be defined in if_ehter.h?  FIXME. */
 #define ETHER_MIN_LEN	60	/* with header, without CRC. */
 #define ETHER_MAX_LEN	1514	/* with header, without CRC. */
-#define ETHER_ADDR_LEN	6	/* number of bytes in an address. */
-#define ETHER_HDR_SIZE	14	/* src addr, dst addr, and data type. */
 
 /*
  * Fe driver specific constants which relate to 86960/86965.
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 51310480477..53e8b77c80f 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.20 2001/02/20 19:39:41 mickey Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.21 2001/06/23 21:54:52 fgsch Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -164,10 +164,6 @@ iomem, and to make 16-pointers, we subtract sc_maddr and and with 0xffff.
 #define	IED_XMIT	0x40
 #define	IED_ALL		0x7f
 
-#define	ETHER_MIN_LEN	64
-#define	ETHER_MAX_LEN	1518
-#define	ETHER_ADDR_LEN	6
-
 /*
 sizeof(iscp) == 1+1+2+4 == 8
 sizeof(scb) == 2+2+2+2+2+2+2+2 == 16