diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2004-09-28 05:14:45 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2004-09-28 05:14:45 +0000 |
| commit | 8d5af6dc281d75a65c5874aab255a7ed8d964aef (patch) | |
| tree | 9b010ca84f74a7950f765a02ec027f808395e758 | |
| parent | 25278a07fc942adb76304767fcfac0eaeeda7de6 (diff) | |
remove if NVLAN around IFCAP_VLAN_MTU
| -rw-r--r-- | sys/dev/ic/fxp.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rtl81x9.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/xl.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c index 9e06e072435..3dddc0b1e62 100644 --- a/sys/dev/ic/fxp.c +++ b/sys/dev/ic/fxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fxp.c,v 1.58 2004/09/20 04:25:27 brad Exp $ */ +/* $OpenBSD: fxp.c,v 1.59 2004/09/28 05:14:44 brad Exp $ */ /* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */ /* @@ -456,13 +456,11 @@ fxp_attach_common(sc, intrstr) ifp->if_watchdog = fxp_watchdog; IFQ_SET_READY(&ifp->if_snd); -#if NVLAN > 0 /* * Only 82558 and newer cards have a bit to ignore oversized frames. */ if (sc->not_82557) - ifp->if_capabilities |= IFCAP_VLAN_MTU; -#endif + ifp->if_capabilities = IFCAP_VLAN_MTU; printf(": %s, address %s\n", intrstr, ether_sprintf(sc->sc_arpcom.ac_enaddr)); diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index 5070775b05c..e43fd18c9a6 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9.c,v 1.27 2004/09/23 17:45:16 brad Exp $ */ +/* $OpenBSD: rtl81x9.c,v 1.28 2004/09/28 05:14:44 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1251,9 +1251,7 @@ rl_attach(sc) bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ); -#if NVLAN > 0 - ifp->if_capabilities |= IFCAP_VLAN_MTU; -#endif + ifp->if_capabilities = IFCAP_VLAN_MTU; /* * Initialize our media structures and probe the MII. diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index b83d44c8993..baee21f0de4 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.55 2004/09/23 17:45:16 brad Exp $ */ +/* $OpenBSD: xl.c,v 1.56 2004/09/28 05:14:44 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2670,9 +2670,7 @@ xl_attach(sc) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = xl_ioctl; -#if NVLAN > 0 - ifp->if_capabilities |= IFCAP_VLAN_MTU; -#endif + ifp->if_capabilities = IFCAP_VLAN_MTU; if (sc->xl_type == XL_TYPE_905B) { ifp->if_start = xl_start_90xB; #ifndef XL905B_TXCSUM_BROKEN |