svn commit: r270856 - in head/sys: dev/ae dev/age dev/alc dev/ale dev/altera/atse dev/bfe dev/cas dev/dc dev/e1000 dev/ffec dev/firewire dev/gem dev/gxemul/ether dev/hme dev/hyperv/netvsc dev/ixgb ...
Gleb Smirnoff
glebius at FreeBSD.org
Sat Aug 30 19:56:04 UTC 2014
Author: glebius
Date: Sat Aug 30 19:55:54 2014
New Revision: 270856
URL: http://svnweb.freebsd.org/changeset/base/270856
Log:
Use define from if_var.h to access a field inside struct if_data,
that resides in struct ifnet.
Sponsored by: Nginx, Inc.
Modified:
head/sys/dev/ae/if_ae.c
head/sys/dev/age/if_age.c
head/sys/dev/alc/if_alc.c
head/sys/dev/ale/if_ale.c
head/sys/dev/altera/atse/if_atse.c
head/sys/dev/bfe/if_bfe.c
head/sys/dev/cas/if_cas.c
head/sys/dev/dc/if_dc.c
head/sys/dev/e1000/if_igb.c
head/sys/dev/ffec/if_ffec.c
head/sys/dev/firewire/if_fwe.c
head/sys/dev/gem/if_gem.c
head/sys/dev/gxemul/ether/if_gx.c
head/sys/dev/hme/if_hme.c
head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
head/sys/dev/ixgb/if_ixgb.c
head/sys/dev/ixgbe/ixgbe.c
head/sys/dev/ixgbe/ixv.c
head/sys/dev/ixl/if_ixl.c
head/sys/dev/ixl/if_ixlv.c
head/sys/dev/jme/if_jme.c
head/sys/dev/le/lance.c
head/sys/dev/msk/if_msk.c
head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
head/sys/dev/nge/if_nge.c
head/sys/dev/qlxgb/qla_os.c
head/sys/dev/qlxgbe/ql_os.c
head/sys/dev/qlxge/qls_os.c
head/sys/dev/re/if_re.c
head/sys/dev/rt/if_rt.c
head/sys/dev/sf/if_sf.c
head/sys/dev/sge/if_sge.c
head/sys/dev/sis/if_sis.c
head/sys/dev/sk/if_sk.c
head/sys/dev/ste/if_ste.c
head/sys/dev/stge/if_stge.c
head/sys/dev/txp/if_txp.c
head/sys/dev/vge/if_vge.c
head/sys/dev/virtio/network/if_vtnet.c
head/sys/dev/vr/if_vr.c
head/sys/dev/vxge/vxge.c
head/sys/mips/cavium/if_octm.c
head/sys/mips/cavium/octe/octe.c
Modified: head/sys/dev/ae/if_ae.c
==============================================================================
--- head/sys/dev/ae/if_ae.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/ae/if_ae.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -363,7 +363,7 @@ ae_attach(device_t dev)
ether_ifattach(ifp, sc->eaddr);
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/*
* Create and run all helper tasks.
Modified: head/sys/dev/age/if_age.c
==============================================================================
--- head/sys/dev/age/if_age.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/age/if_age.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -635,7 +635,7 @@ age_attach(device_t dev)
ifp->if_capenable = ifp->if_capabilities;
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/* Create local taskq. */
sc->age_tq = taskqueue_create_fast("age_taskq", M_WAITOK,
Modified: head/sys/dev/alc/if_alc.c
==============================================================================
--- head/sys/dev/alc/if_alc.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/alc/if_alc.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1012,7 +1012,7 @@ alc_attach(device_t dev)
ifp->if_hwassist &= ~ALC_CSUM_FEATURES;
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/* Create local taskq. */
sc->alc_tq = taskqueue_create_fast("alc_taskq", M_WAITOK,
Modified: head/sys/dev/ale/if_ale.c
==============================================================================
--- head/sys/dev/ale/if_ale.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/ale/if_ale.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -658,7 +658,7 @@ ale_attach(device_t dev)
ifp->if_capenable &= ~IFCAP_RXCSUM;
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/* Create local taskq. */
sc->ale_tq = taskqueue_create_fast("ale_taskq", M_WAITOK,
Modified: head/sys/dev/altera/atse/if_atse.c
==============================================================================
--- head/sys/dev/altera/atse/if_atse.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/altera/atse/if_atse.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1708,7 +1708,7 @@ atse_attach(device_t dev)
ether_ifattach(ifp, sc->atse_eth_addr);
/* Tell the upper layer(s) about vlan mtu support. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU;
ifp->if_capenable = ifp->if_capabilities;
#ifdef DEVICE_POLLING
Modified: head/sys/dev/bfe/if_bfe.c
==============================================================================
--- head/sys/dev/bfe/if_bfe.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/bfe/if_bfe.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -514,7 +514,7 @@ bfe_attach(device_t dev)
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU;
ifp->if_capenable |= IFCAP_VLAN_MTU;
Modified: head/sys/dev/cas/if_cas.c
==============================================================================
--- head/sys/dev/cas/if_cas.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/cas/if_cas.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -423,7 +423,7 @@ cas_attach(struct cas_softc *sc)
/*
* Tell the upper layer(s) we support long frames/checksum offloads.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities = IFCAP_VLAN_MTU;
if ((sc->sc_flags & CAS_NO_CSUM) == 0) {
ifp->if_capabilities |= IFCAP_HWCSUM;
Modified: head/sys/dev/dc/if_dc.c
==============================================================================
--- head/sys/dev/dc/if_dc.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/dc/if_dc.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -2484,7 +2484,7 @@ dc_attach(device_t dev)
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU;
ifp->if_capenable = ifp->if_capabilities;
#ifdef DEVICE_POLLING
Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/e1000/if_igb.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -3241,7 +3241,7 @@ igb_setup_interface(device_t dev, struct
* Tell the upper layer(s) we
* support full VLAN capability.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING
| IFCAP_VLAN_HWTSO
| IFCAP_VLAN_MTU;
Modified: head/sys/dev/ffec/if_ffec.c
==============================================================================
--- head/sys/dev/ffec/if_ffec.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/ffec/if_ffec.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1676,7 +1676,7 @@ ffec_attach(device_t dev)
IFQ_SET_MAXLEN(&ifp->if_snd, TX_DESC_COUNT - 1);
ifp->if_snd.ifq_drv_maxlen = TX_DESC_COUNT - 1;
IFQ_SET_READY(&ifp->if_snd);
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
#if 0 /* XXX The hardware keeps stats we could use for these. */
ifp->if_linkmib = &sc->mibdata;
Modified: head/sys/dev/firewire/if_fwe.c
==============================================================================
--- head/sys/dev/firewire/if_fwe.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/firewire/if_fwe.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -223,7 +223,7 @@ fwe_attach(device_t dev)
splx(s);
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_POLLING;
ifp->if_capenable |= IFCAP_VLAN_MTU;
Modified: head/sys/dev/gem/if_gem.c
==============================================================================
--- head/sys/dev/gem/if_gem.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/gem/if_gem.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -382,7 +382,7 @@ gem_attach(struct gem_softc *sc)
/*
* Tell the upper layer(s) we support long frames/checksum offloads.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_HWCSUM;
ifp->if_hwassist |= sc->sc_csum_features;
ifp->if_capenable |= IFCAP_VLAN_MTU | IFCAP_HWCSUM;
Modified: head/sys/dev/gxemul/ether/if_gx.c
==============================================================================
--- head/sys/dev/gxemul/ether/if_gx.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/gxemul/ether/if_gx.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -324,7 +324,7 @@ gx_ioctl(struct ifnet *ifp, u_long cmd,
return (0);
case SIOCSIFMTU:
- if (ifr->ifr_mtu + ifp->if_data.ifi_hdrlen > GXEMUL_ETHER_DEV_MTU)
+ if (ifr->ifr_mtu + ifp->if_hdrlen > GXEMUL_ETHER_DEV_MTU)
return (ENOTSUP);
return (0);
Modified: head/sys/dev/hme/if_hme.c
==============================================================================
--- head/sys/dev/hme/if_hme.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/hme/if_hme.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -367,7 +367,7 @@ hme_config(struct hme_softc *sc)
/*
* Tell the upper layer(s) we support long frames/checksum offloads.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_HWCSUM;
ifp->if_hwassist |= sc->sc_csum_features;
ifp->if_capenable |= IFCAP_VLAN_MTU | IFCAP_HWCSUM;
Modified: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -275,7 +275,7 @@ netvsc_attach(device_t dev)
/*
* Tell upper layers that we support full VLAN capability.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;
ifp->if_capenable |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;
Modified: head/sys/dev/ixgb/if_ixgb.c
==============================================================================
--- head/sys/dev/ixgb/if_ixgb.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/ixgb/if_ixgb.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1368,7 +1368,7 @@ ixgb_setup_interface(device_t dev, struc
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
#if __FreeBSD_version >= 500000
ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;
Modified: head/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/ixgbe/ixgbe.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -2739,7 +2739,7 @@ ixgbe_setup_interface(device_t dev, stru
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_TSO | IFCAP_VLAN_HWCSUM;
ifp->if_capabilities |= IFCAP_JUMBO_MTU;
Modified: head/sys/dev/ixgbe/ixv.c
==============================================================================
--- head/sys/dev/ixgbe/ixv.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/ixgbe/ixv.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1851,7 +1851,7 @@ ixv_setup_interface(device_t dev, struct
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_TSO4 | IFCAP_VLAN_HWCSUM;
ifp->if_capabilities |= IFCAP_JUMBO_MTU;
Modified: head/sys/dev/ixl/if_ixl.c
==============================================================================
--- head/sys/dev/ixl/if_ixl.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/ixl/if_ixl.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -2288,7 +2288,7 @@ ixl_setup_interface(device_t dev, struct
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_HWCSUM;
ifp->if_capabilities |= IFCAP_HWCSUM_IPV6;
Modified: head/sys/dev/ixl/if_ixlv.c
==============================================================================
--- head/sys/dev/ixl/if_ixlv.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/ixl/if_ixlv.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1367,7 +1367,7 @@ ixlv_setup_interface(device_t dev, struc
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_HWCSUM;
ifp->if_capabilities |= IFCAP_HWCSUM_IPV6;
Modified: head/sys/dev/jme/if_jme.c
==============================================================================
--- head/sys/dev/jme/if_jme.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/jme/if_jme.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -878,7 +878,7 @@ jme_attach(device_t dev)
ifp->if_capenable = ifp->if_capabilities;
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/* Create local taskq. */
sc->jme_tq = taskqueue_create_fast("jme_taskq", M_WAITOK,
Modified: head/sys/dev/le/lance.c
==============================================================================
--- head/sys/dev/le/lance.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/le/lance.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -196,7 +196,7 @@ lance_attach(struct lance_softc *sc)
ether_ifattach(ifp, sc->sc_enaddr);
/* Claim 802.1q capability. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU;
ifp->if_capenable |= IFCAP_VLAN_MTU;
}
Modified: head/sys/dev/msk/if_msk.c
==============================================================================
--- head/sys/dev/msk/if_msk.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/msk/if_msk.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1710,7 +1710,7 @@ msk_attach(device_t dev)
* Must appear after the call to ether_ifattach() because
* ether_ifattach() sets ifi_hdrlen to the default value.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/*
* Do miibus setup.
Modified: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
==============================================================================
--- head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -819,7 +819,7 @@ nf10bmac_attach(device_t dev)
ether_ifattach(ifp, sc->nf10bmac_eth_addr);
/* Tell the upper layer(s) about vlan mtu support. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU;
ifp->if_capenable = ifp->if_capabilities;
#ifdef DEVICE_POLLING
Modified: head/sys/dev/nge/if_nge.c
==============================================================================
--- head/sys/dev/nge/if_nge.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/nge/if_nge.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -964,7 +964,7 @@ nge_attach(device_t dev)
* Must appear after the call to ether_ifattach() because
* ether_ifattach() sets ifi_hdrlen to the default value.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/*
* Hookup IRQ last.
Modified: head/sys/dev/qlxgb/qla_os.c
==============================================================================
--- head/sys/dev/qlxgb/qla_os.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/qlxgb/qla_os.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -699,7 +699,7 @@ qla_init_ifnet(device_t dev, qla_host_t
ifp->if_capenable = ifp->if_capabilities;
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifmedia_init(&ha->media, IFM_IMASK, qla_media_change, qla_media_status);
Modified: head/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- head/sys/dev/qlxgbe/ql_os.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/qlxgbe/ql_os.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -775,7 +775,7 @@ qla_init_ifnet(device_t dev, qla_host_t
ifp->if_capenable = ifp->if_capabilities;
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifmedia_init(&ha->media, IFM_IMASK, qla_media_change, qla_media_status);
Modified: head/sys/dev/qlxge/qls_os.c
==============================================================================
--- head/sys/dev/qlxge/qls_os.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/qlxge/qls_os.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -770,7 +770,7 @@ qls_init_ifnet(device_t dev, qla_host_t
ifp->if_capenable = ifp->if_capabilities;
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifmedia_init(&ha->media, IFM_IMASK, qls_media_change, qls_media_status);
Modified: head/sys/dev/re/if_re.c
==============================================================================
--- head/sys/dev/re/if_re.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/re/if_re.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1681,7 +1681,7 @@ re_attach(device_t dev)
* Must appear after the call to ether_ifattach() because
* ether_ifattach() sets ifi_hdrlen to the default value.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
#ifdef DEV_NETMAP
re_netmap_attach(sc);
Modified: head/sys/dev/rt/if_rt.c
==============================================================================
--- head/sys/dev/rt/if_rt.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/rt/if_rt.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -411,7 +411,7 @@ rt_attach(device_t dev)
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU;
ifp->if_capenable |= IFCAP_VLAN_MTU;
ifp->if_capabilities |= IFCAP_RXCSUM|IFCAP_TXCSUM;
Modified: head/sys/dev/sf/if_sf.c
==============================================================================
--- head/sys/dev/sf/if_sf.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/sf/if_sf.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -902,7 +902,7 @@ sf_attach(device_t dev)
* Must appear after the call to ether_ifattach() because
* ether_ifattach() sets ifi_hdrlen to the default value.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/* Hook interrupt last to avoid having to lock softc */
error = bus_setup_intr(dev, sc->sf_irq, INTR_TYPE_NET | INTR_MPSAFE,
Modified: head/sys/dev/sge/if_sge.c
==============================================================================
--- head/sys/dev/sge/if_sge.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/sge/if_sge.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -641,7 +641,7 @@ sge_attach(device_t dev)
IFCAP_VLAN_HWTSO | IFCAP_VLAN_MTU;
ifp->if_capenable = ifp->if_capabilities;
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/* Hook interrupt last to avoid having to lock softc */
error = bus_setup_intr(dev, sc->sge_irq, INTR_TYPE_NET | INTR_MPSAFE,
Modified: head/sys/dev/sis/if_sis.c
==============================================================================
--- head/sys/dev/sis/if_sis.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/sis/if_sis.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1089,7 +1089,7 @@ sis_attach(device_t dev)
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU;
ifp->if_capenable = ifp->if_capabilities;
#ifdef DEVICE_POLLING
Modified: head/sys/dev/sk/if_sk.c
==============================================================================
--- head/sys/dev/sk/if_sk.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/sk/if_sk.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1496,7 +1496,7 @@ sk_attach(dev)
* Must appear after the call to ether_ifattach() because
* ether_ifattach() sets ifi_hdrlen to the default value.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/*
* Do miibus setup.
Modified: head/sys/dev/ste/if_ste.c
==============================================================================
--- head/sys/dev/ste/if_ste.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/ste/if_ste.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1024,7 +1024,7 @@ ste_attach(device_t dev)
/*
* Tell the upper layer(s) we support long frames.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU;
if (pci_find_cap(dev, PCIY_PMG, &pmc) == 0)
ifp->if_capabilities |= IFCAP_WOL_MAGIC;
Modified: head/sys/dev/stge/if_stge.c
==============================================================================
--- head/sys/dev/stge/if_stge.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/stge/if_stge.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -621,7 +621,7 @@ stge_attach(device_t dev)
* Must appear after the call to ether_ifattach() because
* ether_ifattach() sets ifi_hdrlen to the default value.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/*
* The manual recommends disabling early transmit, so we
Modified: head/sys/dev/txp/if_txp.c
==============================================================================
--- head/sys/dev/txp/if_txp.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/txp/if_txp.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -436,7 +436,7 @@ txp_attach(device_t dev)
ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWCSUM;
ifp->if_capenable = ifp->if_capabilities;
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
WRITE_REG(sc, TXP_IER, TXP_INTR_NONE);
WRITE_REG(sc, TXP_IMR, TXP_INTR_ALL);
Modified: head/sys/dev/vge/if_vge.c
==============================================================================
--- head/sys/dev/vge/if_vge.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/vge/if_vge.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1130,7 +1130,7 @@ vge_attach(device_t dev)
ether_ifattach(ifp, eaddr);
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/* Hook interrupt last to avoid having to lock softc */
error = bus_setup_intr(dev, sc->vge_irq, INTR_TYPE_NET|INTR_MPSAFE,
Modified: head/sys/dev/virtio/network/if_vtnet.c
==============================================================================
--- head/sys/dev/virtio/network/if_vtnet.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/virtio/network/if_vtnet.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -947,7 +947,7 @@ vtnet_setup_interface(struct vtnet_softc
ifp->if_capabilities |= IFCAP_LINKSTATE;
/* Tell the upper layer(s) we support long frames. */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_JUMBO_MTU | IFCAP_VLAN_MTU;
if (virtio_with_feature(dev, VIRTIO_NET_F_CSUM)) {
Modified: head/sys/dev/vr/if_vr.c
==============================================================================
--- head/sys/dev/vr/if_vr.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/vr/if_vr.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -784,7 +784,7 @@ vr_attach(device_t dev)
* Must appear after the call to ether_ifattach() because
* ether_ifattach() sets ifi_hdrlen to the default value.
*/
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
/* Hook interrupt last to avoid having to lock softc. */
error = bus_setup_intr(dev, sc->vr_irq, INTR_TYPE_NET | INTR_MPSAFE,
Modified: head/sys/dev/vxge/vxge.c
==============================================================================
--- head/sys/dev/vxge/vxge.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/dev/vxge/vxge.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -1395,7 +1395,7 @@ vxge_ifp_setup(device_t ndev)
IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
/* IFQ_SET_READY(&ifp->if_snd); */
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM;
ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;
Modified: head/sys/mips/cavium/if_octm.c
==============================================================================
--- head/sys/mips/cavium/if_octm.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/mips/cavium/if_octm.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -238,7 +238,7 @@ octm_attach(device_t dev)
ifp->if_transmit = octm_transmit;
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities = IFCAP_VLAN_MTU;
ifp->if_capenable = ifp->if_capabilities;
@@ -473,7 +473,7 @@ octm_ioctl(struct ifnet *ifp, u_long cmd
return (0);
case SIOCSIFMTU:
- cvmx_mgmt_port_set_max_packet_size(sc->sc_port, ifr->ifr_mtu + ifp->if_data.ifi_hdrlen);
+ cvmx_mgmt_port_set_max_packet_size(sc->sc_port, ifr->ifr_mtu + ifp->if_hdrlen);
return (0);
case SIOCSIFMEDIA:
Modified: head/sys/mips/cavium/octe/octe.c
==============================================================================
--- head/sys/mips/cavium/octe/octe.c Sat Aug 30 18:35:16 2014 (r270855)
+++ head/sys/mips/cavium/octe/octe.c Sat Aug 30 19:55:54 2014 (r270856)
@@ -189,7 +189,7 @@ octe_attach(device_t dev)
ifp->if_transmit = octe_transmit;
- ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+ ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_HWCSUM;
ifp->if_capenable = ifp->if_capabilities;
ifp->if_hwassist = CSUM_TCP | CSUM_UDP;
More information about the svn-src-head
mailing list