[src/trunk]: src/sys Use ETHER_*_LEN constants from <net/if_ether.h> instead ...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2e74a88e3858
branches:  trunk
changeset: 467561:2e74a88e3858
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Mar 25 23:16:37 1999 +0000

description:
Use ETHER_*_LEN constants from <net/if_ether.h> instead of defining them
ourselves.

diffstat:

 sys/arch/vax/boot/boot/if_le.c |  6 +-----
 sys/arch/vax/boot/boot/if_ze.c |  5 +----
 sys/arch/x68k/dev/if_se.c      |  7 +------
 sys/dev/ic/dp8390.c            |  6 +-----
 sys/dev/ic/elink3.c            |  6 +-----
 sys/dev/ic/elinkxl.c           |  6 +-----
 sys/dev/ic/i82586var.h         |  6 +-----
 7 files changed, 7 insertions(+), 35 deletions(-)

diffs (140 lines):

diff -r 5f586b10a3ef -r 2e74a88e3858 sys/arch/vax/boot/boot/if_le.c
--- a/sys/arch/vax/boot/boot/if_le.c    Thu Mar 25 23:16:14 1999 +0000
+++ b/sys/arch/vax/boot/boot/if_le.c    Thu Mar 25 23:16:37 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_le.c,v 1.1 1999/03/06 16:36:05 ragge Exp $ */
+/*     $NetBSD: if_le.c,v 1.2 1999/03/25 23:16:37 thorpej Exp $ */
 /*
  * Copyright (c) 1997 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -47,10 +47,6 @@
 #include <dev/ic/lancereg.h>
 #include <dev/ic/am7990reg.h>
 
-#define        ETHER_MIN_LEN   64
-#define        ETHER_MAX_LEN   1518
-#define        ETHER_ADDR_LEN  6
-
 /*
  * The following are incorrect. Why doesn't DEC follow its own specs???
  */
diff -r 5f586b10a3ef -r 2e74a88e3858 sys/arch/vax/boot/boot/if_ze.c
--- a/sys/arch/vax/boot/boot/if_ze.c    Thu Mar 25 23:16:14 1999 +0000
+++ b/sys/arch/vax/boot/boot/if_ze.c    Thu Mar 25 23:16:37 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ze.c,v 1.1 1999/03/06 16:36:05 ragge Exp $  */
+/*     $NetBSD: if_ze.c,v 1.2 1999/03/25 23:16:37 thorpej Exp $        */
 /*
  * Copyright (c) 1998 James R. Maynard III.  All rights reserved.
  *
@@ -61,9 +61,6 @@
 
 #define NRCV 5                         /* allocate 5 receive descriptors */
 #define NXMT 5                         /* and 5 transmit - must be >1 */
-#define ETHER_MAX_LEN 1518             /* maximum Ethernet frame */
-#define ETHER_MIN_LEN 64               /* minimum Ethernet frame */
-#define ETHER_ADDR_LEN 6               /* length of an Ethernet address */
 #define SETUP_FRAME_LEN 128            /* length of the setup frame */
 
 /* allocate a buffer on an octaword boundary */
diff -r 5f586b10a3ef -r 2e74a88e3858 sys/arch/x68k/dev/if_se.c
--- a/sys/arch/x68k/dev/if_se.c Thu Mar 25 23:16:14 1999 +0000
+++ b/sys/arch/x68k/dev/if_se.c Thu Mar 25 23:16:37 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_se.c,v 1.6 1998/07/05 06:49:10 jonathan Exp $       */
+/*     $NetBSD: if_se.c,v 1.7 1999/03/25 23:17:35 thorpej Exp $        */
 
 /*
  * Device driver for National Semiconductor DS8390 based ethernet adapters.
@@ -217,11 +217,6 @@
 
 extern int ether_output();
 
-#define        ETHER_MIN_LEN   64
-#define ETHER_MAX_LEN  1518
-#define        ETHER_ADDR_LEN  6
-#define        ETHER_HDR_SIZE  14
-
 char se_name[] = "DP8390 SCSI Ethernet Adapter (Ether+)";
 static char zero = 0;
 static u_char ones = 0xff;
diff -r 5f586b10a3ef -r 2e74a88e3858 sys/dev/ic/dp8390.c
--- a/sys/dev/ic/dp8390.c       Thu Mar 25 23:16:14 1999 +0000
+++ b/sys/dev/ic/dp8390.c       Thu Mar 25 23:16:37 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dp8390.c,v 1.22 1999/02/28 17:10:52 explorer Exp $     */
+/*     $NetBSD: dp8390.c,v 1.23 1999/03/25 23:18:31 thorpej Exp $      */
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -78,10 +78,6 @@
 int    dp8390_mediachange __P((struct ifnet *));
 void   dp8390_mediastatus __P((struct ifnet *, struct ifmediareq *));
 
-#define        ETHER_MIN_LEN   64
-#define ETHER_MAX_LEN  1518
-#define        ETHER_ADDR_LEN  6
-
 int    dp8390_debug = 0;
 
 /*
diff -r 5f586b10a3ef -r 2e74a88e3858 sys/dev/ic/elink3.c
--- a/sys/dev/ic/elink3.c       Thu Mar 25 23:16:14 1999 +0000
+++ b/sys/dev/ic/elink3.c       Thu Mar 25 23:16:37 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elink3.c,v 1.53 1999/02/28 17:10:53 explorer Exp $     */
+/*     $NetBSD: elink3.c,v 1.54 1999/03/25 23:18:32 thorpej Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -120,10 +120,6 @@
 #include <dev/ic/elink3var.h>
 #include <dev/ic/elink3reg.h>
 
-#define ETHER_MIN_LEN  64
-#define ETHER_MAX_LEN   1518
-#define ETHER_ADDR_LEN  6
-
 #ifdef DEBUG
 int epdebug = 0;
 #endif
diff -r 5f586b10a3ef -r 2e74a88e3858 sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Thu Mar 25 23:16:14 1999 +0000
+++ b/sys/dev/ic/elinkxl.c      Thu Mar 25 23:16:37 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxl.c,v 1.5 1999/02/28 17:10:53 explorer Exp $     */
+/*     $NetBSD: elinkxl.c,v 1.6 1999/03/25 23:18:32 thorpej Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -93,10 +93,6 @@
 #include <dev/ic/elinkxlreg.h>
 #include <dev/ic/elinkxlvar.h>
 
-#define ETHER_MIN_LEN  64
-#define ETHER_MAX_LEN   1518
-#define ETHER_ADDR_LEN  6
-
 #ifdef DEBUG
 int exdebug = 0;
 #endif
diff -r 5f586b10a3ef -r 2e74a88e3858 sys/dev/ic/i82586var.h
--- a/sys/dev/ic/i82586var.h    Thu Mar 25 23:16:14 1999 +0000
+++ b/sys/dev/ic/i82586var.h    Thu Mar 25 23:16:37 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82586var.h,v 1.10 1998/08/15 04:42:42 mycroft Exp $   */
+/*     $NetBSD: i82586var.h,v 1.11 1999/03/25 23:18:32 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -109,10 +109,6 @@
 #define IED_XMIT       0x40
 #define        IED_ALL         0x7f
 
-#define        ETHER_MIN_LEN   64
-#define        ETHER_MAX_LEN   1518
-#define        ETHER_ADDR_LEN  6
-
 #define B_PER_F                3               /* recv buffers per frame */
 #define        IE_RBUF_SIZE    256             /* size of each receive buffer;
                                                MUST BE POWER OF TWO */