From 3e297267a1db1cd1a3b0538d8a4b260095ef430f Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Thu, 5 Aug 2004 21:17:21 +0000 Subject: remove some separate per driver constants and use ETHER_MAX_LEN_JUMBO/ETHERMTU_JUMBO where appropriate. --- sys/dev/ic/rtl81x9reg.h | 5 +---- sys/dev/pci/if_re.c | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h index b3f6f70d7f3..60015db1783 100644 --- a/sys/dev/ic/rtl81x9reg.h +++ b/sys/dev/ic/rtl81x9reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9reg.h,v 1.14 2004/08/05 20:51:30 deraadt Exp $ */ +/* $OpenBSD: rtl81x9reg.h,v 1.15 2004/08/05 21:17:20 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -574,9 +574,6 @@ struct rl_stats { #define RL_ADDR_LO(y) ((u_int64_t) (y) & 0xFFFFFFFF) #define RL_ADDR_HI(y) ((u_int64_t) (y) >> 32) -#define RL_JUMBO_FRAMELEN 9018 -#define RL_JUMBO_MTU (RL_JUMBO_FRAMELEN-ETHER_HDR_LEN-ETHER_CRC_LEN) - #define MAX_NUM_MULTICAST_ADDRESSES 128 #define RL_INC(x) (x = (x + 1) % RL_TX_LIST_CNT) diff --git a/sys/dev/pci/if_re.c b/sys/dev/pci/if_re.c index e37dfc70846..82a307d290c 100644 --- a/sys/dev/pci/if_re.c +++ b/sys/dev/pci/if_re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re.c,v 1.7 2004/07/20 05:40:42 pvalchev Exp $ */ +/* $OpenBSD: if_re.c,v 1.8 2004/08/05 21:17:20 brad Exp $ */ /* * Copyright (c) 1997, 1998-2003 * Bill Paul . All rights reserved. @@ -1989,7 +1989,7 @@ re_ioctl(ifp, command, data) } break; case SIOCSIFMTU: - if (ifr->ifr_mtu > RL_JUMBO_MTU) + if (ifr->ifr_mtu > ETHERMTU_JUMBO) error = EINVAL; ifp->if_mtu = ifr->ifr_mtu; break; -- cgit v1.2.3