remove IFCAP_JUMBO_MTU interface capabilities flag and set if_hardmtu in a few

more drivers.

ok reyk@

11 files changed, 28 insertions, 26 deletions

diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index 49fd8ae857a..0d0661fb2e0 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: re.c,v 1.22 2006/05/26 20:50:41 deraadt Exp $	*/
+/*	$OpenBSD: re.c,v 1.23 2006/05/27 10:03:15 brad Exp $	*/
 /*	$FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $	*/
 /*
  * Copyright (c) 1997, 1998-2003
@@ -878,13 +878,12 @@ re_attach_common(struct rl_softc *sc)
 	if (sc->rl_type == RL_8169) {
 		ifp->if_baudrate = 1000000000;
 		ifp->if_hardmtu = RL_JUMBO_MTU;
-		ifp->if_capabilities |= IFCAP_JUMBO_MTU;
 	} else
 		ifp->if_baudrate = 100000000;
 	IFQ_SET_MAXLEN(&ifp->if_snd, RL_IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);
 
-	ifp->if_capabilities |= IFCAP_VLAN_MTU;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 #ifdef RE_CSUM_OFFLOAD
 	ifp->if_capabilities |= IFCAP_CSUM_IPv4|IFCAP_CSUM_TCPv4|
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 2e120a44760..32857ed571e 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.146 2006/05/20 04:18:51 brad Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.147 2006/05/27 10:03:15 brad Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -1937,7 +1937,7 @@ bge_attach(struct device *parent, struct device *self, void *aux)
 	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 	if (BGE_IS_JUMBO_CAPABLE(sc))
-		ifp->if_capabilities |= IFCAP_JUMBO_MTU;
+		ifp->if_hardmtu = ETHERMTU_JUMBO;
 
 	/*
 	 * Do MII setup.
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 57567c6c113..852314909e2 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_em.c,v 1.125 2006/05/26 20:50:41 deraadt Exp $ */
+/* $OpenBSD: if_em.c,v 1.126 2006/05/27 10:03:15 brad Exp $ */
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
 
 #include <dev/pci/if_em.h>
@@ -1514,12 +1514,11 @@ em_setup_interface(struct em_softc *sc)
 	if (sc->hw.mac_type != em_82573) {
 		ifp->if_hardmtu =
 			sc->hw.max_frame_size - ETHER_HDR_LEN - ETHER_CRC_LEN;
-		ifp->if_capabilities |= IFCAP_JUMBO_MTU;
 	}
 	IFQ_SET_MAXLEN(&ifp->if_snd, sc->num_tx_desc - 1);
 	IFQ_SET_READY(&ifp->if_snd);
 
-	ifp->if_capabilities |= IFCAP_VLAN_MTU;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 	/* 
 	 * Specify the media types supported by this adapter and register
diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c
index dc9e4129d00..a73f0c8bd40 100644
--- a/sys/dev/pci/if_ixgb.c
+++ b/sys/dev/pci/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb.c,v 1.16 2006/05/26 20:50:41 deraadt Exp $ */
+/* $OpenBSD: if_ixgb.c,v 1.17 2006/05/27 10:03:15 brad Exp $ */
 
 #include <dev/pci/if_ixgb.h>
 
@@ -1039,7 +1039,7 @@ ixgb_setup_interface(struct ixgb_softc *sc)
 	IFQ_SET_MAXLEN(&ifp->if_snd, sc->num_tx_desc - 1);
 	IFQ_SET_READY(&ifp->if_snd);
 
-	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_JUMBO_MTU;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 	/*
 	 * Specify the media types supported by this adapter and register
diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c
index ad8bd5612a2..09122271bf3 100644
--- a/sys/dev/pci/if_lge.c
+++ b/sys/dev/pci/if_lge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lge.c,v 1.40 2006/05/20 03:47:56 brad Exp $	*/
+/*	$OpenBSD: if_lge.c,v 1.41 2006/05/27 10:03:15 brad Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -564,12 +564,13 @@ lge_attach(struct device *parent, struct device *self, void *aux)
 	ifp->if_start = lge_start;
 	ifp->if_watchdog = lge_watchdog;
 	ifp->if_baudrate = 1000000000;
+	ifp->if_hardmtu = ETHERMTU_JUMBO;
 	IFQ_SET_MAXLEN(&ifp->if_snd, LGE_TX_LIST_CNT - 1);
 	IFQ_SET_READY(&ifp->if_snd);
 	DPRINTFN(5, ("bcopy\n"));
 	bcopy(sc->sc_dv.dv_xname, ifp->if_xname, IFNAMSIZ);
 
-	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_JUMBO_MTU;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 	if (CSR_READ_4(sc, LGE_GMIIMODE) & LGE_GMIIMODE_PCSENH)
 		sc->lge_pcs = 1;
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index e403caa68a6..a3459435b8e 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nfe.c,v 1.58 2006/05/20 03:47:56 brad Exp $	*/
+/*	$OpenBSD: if_nfe.c,v 1.59 2006/05/27 10:03:15 brad Exp $	*/
 
 /*-
  * Copyright (c) 2006 Damien Bergamini <damien.bergamini@free.fr>
@@ -259,7 +259,7 @@ nfe_attach(struct device *parent, struct device *self, void *aux)
 	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 	if (sc->sc_flags & NFE_USE_JUMBO)
-		ifp->if_capabilities |= IFCAP_JUMBO_MTU;
+		ifp->if_hardmtu = ETHERMTU_JUMBO;
 
 #if NVLAN > 0
 	if (sc->sc_flags & NFE_HW_VLAN)
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index f6e22d327b8..91b21e76c95 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nge.c,v 1.52 2006/05/20 03:47:56 brad Exp $	*/
+/*	$OpenBSD: if_nge.c,v 1.53 2006/05/27 10:03:15 brad Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -885,12 +885,13 @@ nge_attach(parent, self, aux)
 	ifp->if_start = nge_start;
 	ifp->if_watchdog = nge_watchdog;
 	ifp->if_baudrate = 1000000000;
+	ifp->if_hardmtu = ETHERMTU_JUMBO;
 	IFQ_SET_MAXLEN(&ifp->if_snd, NGE_TX_LIST_CNT - 1);
 	IFQ_SET_READY(&ifp->if_snd);
 	DPRINTFN(5, ("%s: bcopy\n", sc->sc_dv.dv_xname));
 	bcopy(sc->sc_dv.dv_xname, ifp->if_xname, IFNAMSIZ);
 
-	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_JUMBO_MTU;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 #ifdef NGE_VLAN
 	ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING;
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 9c48007e585..ec4a935fe1b 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.108 2006/05/20 03:47:56 brad Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.109 2006/05/27 10:03:15 brad Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1266,11 +1266,12 @@ sk_attach(struct device *parent, struct device *self, void *aux)
 	ifp->if_start = sk_start;
 	ifp->if_watchdog = sk_watchdog;
 	ifp->if_baudrate = 1000000000;
+	ifp->if_hardmtu = ETHERMTU_JUMBO;
 	IFQ_SET_MAXLEN(&ifp->if_snd, SK_TX_RING_CNT - 1);
 	IFQ_SET_READY(&ifp->if_snd);
 	bcopy(sc_if->sk_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
 
-	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_JUMBO_MTU;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 	/*
 	 * Do miibus setup.
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index b7a2dd8fbc0..a1f46bb92dc 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ti.c,v 1.80 2006/05/20 03:47:56 brad Exp $	*/
+/*	$OpenBSD: if_ti.c,v 1.81 2006/05/27 10:03:15 brad Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -1648,11 +1648,12 @@ ti_attach(struct device *parent, struct device *self, void *aux)
 	ifp->if_ioctl = ti_ioctl;
 	ifp->if_start = ti_start;
 	ifp->if_watchdog = ti_watchdog;
+	ifp->if_hardmtu = ETHERMTU_JUMBO;
 	IFQ_SET_MAXLEN(&ifp->if_snd, TI_TX_RING_CNT - 1);
 	IFQ_SET_READY(&ifp->if_snd);
 	bcopy(sc->sc_dv.dv_xname, ifp->if_xname, IFNAMSIZ);
 
-	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_JUMBO_MTU;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 #if TI_VLAN
 #if NVLAN > 0
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 00901a78b0f..bfb91a89370 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vge.c,v 1.21 2006/05/20 03:47:56 brad Exp $	*/
+/*	$OpenBSD: if_vge.c,v 1.22 2006/05/27 10:03:15 brad Exp $	*/
 /*	$FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -782,12 +782,12 @@ vge_attach(struct device *parent, struct device *self, void *aux)
 	ifp->if_watchdog = vge_watchdog;
 	ifp->if_init = vge_init;
 	ifp->if_baudrate = 1000000000;
+	ifp->if_hardmtu = ETHERMTU_JUMBO;
 	IFQ_SET_MAXLEN(&ifp->if_snd, VGE_IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);
 
-	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_JUMBO_MTU |
-				IFCAP_CSUM_IPv4 | IFCAP_CSUM_TCPv4 |
-				IFCAP_CSUM_UDPv4;
+	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_CSUM_IPv4 |
+				IFCAP_CSUM_TCPv4 | IFCAP_CSUM_UDPv4;
 
 #ifdef VGE_VLAN
 	ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING;
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index fdcb3da8ad5..ce5d784782f 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xge.c,v 1.14 2006/05/26 20:50:41 deraadt Exp $	*/
+/*	$OpenBSD: if_xge.c,v 1.15 2006/05/27 10:03:15 brad Exp $	*/
 /*	$NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $	*/
 
 /*
@@ -564,7 +564,7 @@ xge_attach(struct device *parent, struct device *self, void *aux)
 	IFQ_SET_MAXLEN(&ifp->if_snd, NTXDESCS - 1);
 	IFQ_SET_READY(&ifp->if_snd);
 
-	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_JUMBO_MTU;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 	/*
 	 * Attach the interface.