From 41b065b8d46fe265392cdb2ddde288e6685e6a17 Mon Sep 17 00:00:00 2001 From: kevlo Date: Sat, 7 Jan 2012 09:41:57 +0000 Subject: ether_ifattach() sets if_mtu to ETHERMTU, don't bother set it again Reviewed by: yongari --- sys/dev/an/if_an.c | 1 - sys/dev/bfe/if_bfe.c | 1 - sys/dev/bm/if_bm.c | 1 - sys/dev/bxe/if_bxe.c | 1 - sys/dev/e1000/if_em.c | 1 - sys/dev/e1000/if_igb.c | 1 - sys/dev/e1000/if_lem.c | 1 - sys/dev/ep/if_ep.c | 1 - sys/dev/ex/if_ex.c | 1 - sys/dev/firewire/if_fwe.c | 1 - sys/dev/ie/if_ie.c | 1 - sys/dev/if_ndis/if_ndis.c | 1 - sys/dev/ixgb/if_ixgb.c | 1 - sys/dev/ixgbe/ixgbe.c | 1 - sys/dev/ixgbe/ixv.c | 1 - sys/dev/lge/if_lge.c | 1 - sys/dev/msk/if_msk.c | 1 - sys/dev/my/if_my.c | 1 - sys/dev/nfe/if_nfe.c | 1 - sys/dev/nve/if_nve.c | 1 - sys/dev/qlxgb/qla_os.c | 1 - sys/dev/rt/if_rt.c | 1 - sys/dev/sis/if_sis.c | 1 - sys/dev/sk/if_sk.c | 1 - sys/dev/sn/if_sn.c | 1 - sys/dev/snc/dp83932.c | 1 - sys/dev/stge/if_stge.c | 1 - sys/dev/tl/if_tl.c | 1 - sys/dev/tsec/if_tsec.c | 1 - sys/dev/usb/net/usb_ethernet.c | 1 - sys/dev/vx/if_vx.c | 1 - sys/dev/vxge/vxge.c | 1 - sys/dev/wb/if_wb.c | 1 - sys/dev/xen/netback/netback.c | 1 - sys/dev/xen/netfront/netfront.c | 1 - 35 files changed, 35 deletions(-) (limited to 'sys') diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c index aa7c918..5d90850 100644 --- a/sys/dev/an/if_an.c +++ b/sys/dev/an/if_an.c @@ -761,7 +761,6 @@ an_attach(struct an_softc *sc, int flags) ifp->if_softc = sc; if_initname(ifp, device_get_name(sc->an_dev), device_get_unit(sc->an_dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = an_ioctl; ifp->if_start = an_start; diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c index 6dd33cd..06c8fda 100644 --- a/sys/dev/bfe/if_bfe.c +++ b/sys/dev/bfe/if_bfe.c @@ -489,7 +489,6 @@ bfe_attach(device_t dev) ifp->if_ioctl = bfe_ioctl; ifp->if_start = bfe_start; ifp->if_init = bfe_init; - ifp->if_mtu = ETHERMTU; IFQ_SET_MAXLEN(&ifp->if_snd, BFE_TX_QLEN); ifp->if_snd.ifq_drv_maxlen = BFE_TX_QLEN; IFQ_SET_READY(&ifp->if_snd); diff --git a/sys/dev/bm/if_bm.c b/sys/dev/bm/if_bm.c index 872da6d..01706df 100644 --- a/sys/dev/bm/if_bm.c +++ b/sys/dev/bm/if_bm.c @@ -468,7 +468,6 @@ bm_attach(device_t dev) if_initname(ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = bm_start; ifp->if_ioctl = bm_ioctl; diff --git a/sys/dev/bxe/if_bxe.c b/sys/dev/bxe/if_bxe.c index 5f7f6a6..1c5398a 100644 --- a/sys/dev/bxe/if_bxe.c +++ b/sys/dev/bxe/if_bxe.c @@ -2136,7 +2136,6 @@ bxe_attach(device_t dev) #endif ifp->if_init = bxe_init; - ifp->if_mtu = ETHERMTU; ifp->if_hwassist = BXE_IF_HWASSIST; ifp->if_capabilities = BXE_IF_CAPABILITIES; /* TPA not enabled by default. */ diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index f6cc363..4d0ad8f 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2898,7 +2898,6 @@ em_setup_interface(device_t dev, struct adapter *adapter) return (-1); } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_init = em_init; ifp->if_softc = adapter; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c index 1380c3b..d83130c 100644 --- a/sys/dev/e1000/if_igb.c +++ b/sys/dev/e1000/if_igb.c @@ -2899,7 +2899,6 @@ igb_setup_interface(device_t dev, struct adapter *adapter) return (-1); } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_init = igb_init; ifp->if_softc = adapter; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; diff --git a/sys/dev/e1000/if_lem.c b/sys/dev/e1000/if_lem.c index ae56219..216ec95 100644 --- a/sys/dev/e1000/if_lem.c +++ b/sys/dev/e1000/if_lem.c @@ -2354,7 +2354,6 @@ lem_setup_interface(device_t dev, struct adapter *adapter) return (-1); } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_init = lem_init; ifp->if_softc = adapter; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index 2436255..7be1f80 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -301,7 +301,6 @@ ep_attach(struct ep_softc *sc) ifp->if_softc = sc; if_initname(ifp, device_get_name(sc->dev), device_get_unit(sc->dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = epstart; ifp->if_ioctl = epioctl; diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c index efd54bc..8037b11 100644 --- a/sys/dev/ex/if_ex.c +++ b/sys/dev/ex/if_ex.c @@ -232,7 +232,6 @@ ex_attach(device_t dev) */ ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST; ifp->if_start = ex_start; ifp->if_ioctl = ex_ioctl; diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c index 52a9c8d..fa51026 100644 --- a/sys/dev/firewire/if_fwe.c +++ b/sys/dev/firewire/if_fwe.c @@ -214,7 +214,6 @@ fwe_attach(device_t dev) #endif ifp->if_start = fwe_start; ifp->if_ioctl = fwe_ioctl; - ifp->if_mtu = ETHERMTU; ifp->if_flags = (IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST); ifp->if_snd.ifq_maxlen = TX_MAX_QUEUE; diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c index 172bf9e..363255b 100644 --- a/sys/dev/ie/if_ie.c +++ b/sys/dev/ie/if_ie.c @@ -313,7 +313,6 @@ ie_attach(device_t dev) ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = iestart; ifp->if_ioctl = ieioctl; diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c index 68b7d98..10fc018 100644 --- a/sys/dev/if_ndis/if_ndis.c +++ b/sys/dev/if_ndis/if_ndis.c @@ -714,7 +714,6 @@ ndis_attach(dev) ndis_probe_offload(sc); if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = ndis_ioctl; ifp->if_start = ndis_start; diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c index e5cddb3..33db5b2 100644 --- a/sys/dev/ixgb/if_ixgb.c +++ b/sys/dev/ixgb/if_ixgb.c @@ -1354,7 +1354,6 @@ ixgb_setup_interface(device_t dev, struct adapter * adapter) ifp->if_unit = device_get_unit(dev); ifp->if_name = "ixgb"; #endif - ifp->if_mtu = ETHERMTU; ifp->if_baudrate = 1000000000; ifp->if_init = ixgb_init; ifp->if_softc = adapter; diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c index 6277848..8e4a7b4 100644 --- a/sys/dev/ixgbe/ixgbe.c +++ b/sys/dev/ixgbe/ixgbe.c @@ -2431,7 +2431,6 @@ ixgbe_setup_interface(device_t dev, struct adapter *adapter) return (-1); } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_baudrate = 1000000000; ifp->if_init = ixgbe_init; ifp->if_softc = adapter; diff --git a/sys/dev/ixgbe/ixv.c b/sys/dev/ixgbe/ixv.c index eaf05d2..1a8b507 100644 --- a/sys/dev/ixgbe/ixv.c +++ b/sys/dev/ixgbe/ixv.c @@ -1829,7 +1829,6 @@ ixv_setup_interface(device_t dev, struct adapter *adapter) if (ifp == NULL) panic("%s: can not if_alloc()\n", device_get_nameunit(dev)); if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_baudrate = 1000000000; ifp->if_init = ixv_init; ifp->if_softc = adapter; diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c index 6f69a0a..26bd410 100644 --- a/sys/dev/lge/if_lge.c +++ b/sys/dev/lge/if_lge.c @@ -536,7 +536,6 @@ lge_attach(dev) } ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = lge_ioctl; ifp->if_start = lge_start; diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c index aa08f51..304e6a2 100644 --- a/sys/dev/msk/if_msk.c +++ b/sys/dev/msk/if_msk.c @@ -1636,7 +1636,6 @@ msk_attach(device_t dev) } ifp->if_softc = sc_if; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_capabilities = IFCAP_TXCSUM | IFCAP_TSO4; /* diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c index 4b59c48..c7c0ad4 100644 --- a/sys/dev/my/if_my.c +++ b/sys/dev/my/if_my.c @@ -895,7 +895,6 @@ my_attach(device_t dev) } ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = my_ioctl; ifp->if_start = my_start; diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c index f4c5bed..fe072f3 100644 --- a/sys/dev/nfe/if_nfe.c +++ b/sys/dev/nfe/if_nfe.c @@ -565,7 +565,6 @@ nfe_attach(device_t dev) ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = nfe_ioctl; ifp->if_start = nfe_start; diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c index 5c53239..f02cf07 100644 --- a/sys/dev/nve/if_nve.c +++ b/sys/dev/nve/if_nve.c @@ -529,7 +529,6 @@ nve_attach(device_t dev) ifp->if_ioctl = nve_ioctl; ifp->if_start = nve_ifstart; ifp->if_init = nve_init; - ifp->if_mtu = ETHERMTU; ifp->if_baudrate = IF_Mbps(100); IFQ_SET_MAXLEN(&ifp->if_snd, TX_RING_SIZE - 1); ifp->if_snd.ifq_drv_maxlen = TX_RING_SIZE - 1; diff --git a/sys/dev/qlxgb/qla_os.c b/sys/dev/qlxgb/qla_os.c index 77695d5..5dc3849 100644 --- a/sys/dev/qlxgb/qla_os.c +++ b/sys/dev/qlxgb/qla_os.c @@ -660,7 +660,6 @@ qla_init_ifnet(device_t dev, qla_host_t *ha) if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_baudrate = (1 * 1000 * 1000 *1000); ifp->if_init = qla_init; ifp->if_softc = ha; diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c index a1667e5..6649782 100644 --- a/sys/dev/rt/if_rt.c +++ b/sys/dev/rt/if_rt.c @@ -383,7 +383,6 @@ rt_attach(device_t dev) ifp->if_init = rt_init; ifp->if_ioctl = rt_ioctl; ifp->if_start = rt_start; - ifp->if_mtu = ETHERMTU; #define RT_TX_QLEN 256 IFQ_SET_MAXLEN(&ifp->if_snd, RT_TX_QLEN); diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c index ba8106e..c5bb8a0 100644 --- a/sys/dev/sis/if_sis.c +++ b/sys/dev/sis/if_sis.c @@ -1054,7 +1054,6 @@ sis_attach(device_t dev) } ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = sis_ioctl; ifp->if_start = sis_start; diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index b217784..836c34d 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -1350,7 +1350,6 @@ sk_attach(dev) } ifp->if_softc = sc_if; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; /* * SK_GENESIS has a bug in checksum offload - From linux. diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c index 0f86f92..8aef549 100644 --- a/sys/dev/sn/if_sn.c +++ b/sys/dev/sn/if_sn.c @@ -201,7 +201,6 @@ sn_attach(device_t dev) } ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = snstart; ifp->if_ioctl = snioctl; diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c index 0b62053..f86ad7e 100644 --- a/sys/dev/snc/dp83932.c +++ b/sys/dev/snc/dp83932.c @@ -176,7 +176,6 @@ sncconfig(sc, media, nmedia, defmedia, myea) ifp->if_start = sncstart; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_init = sncinit; - ifp->if_mtu = ETHERMTU; IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); /* Initialize media goo. */ diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c index 28e9584..7de2115 100644 --- a/sys/dev/stge/if_stge.c +++ b/sys/dev/stge/if_stge.c @@ -573,7 +573,6 @@ stge_attach(device_t dev) ifp->if_ioctl = stge_ioctl; ifp->if_start = stge_start; ifp->if_init = stge_init; - ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_drv_maxlen = STGE_TX_RING_CNT - 1; IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); IFQ_SET_READY(&ifp->if_snd); diff --git a/sys/dev/tl/if_tl.c b/sys/dev/tl/if_tl.c index 4ab97e4..5f489bf 100644 --- a/sys/dev/tl/if_tl.c +++ b/sys/dev/tl/if_tl.c @@ -1175,7 +1175,6 @@ tl_attach(dev) ifp->if_ioctl = tl_ioctl; ifp->if_start = tl_start; ifp->if_init = tl_init; - ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_maxlen = TL_TX_LIST_CNT - 1; ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_capenable |= IFCAP_VLAN_MTU; diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c index c924419..ce257ab 100644 --- a/sys/dev/tsec/if_tsec.c +++ b/sys/dev/tsec/if_tsec.c @@ -247,7 +247,6 @@ tsec_attach(struct tsec_softc *sc) ifp->if_softc = sc; if_initname(ifp, device_get_name(sc->dev), device_get_unit(sc->dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_SIMPLEX | IFF_MULTICAST | IFF_BROADCAST; ifp->if_init = tsec_init; ifp->if_start = tsec_start; diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index e405ae8..2a7bddf 100644 --- a/sys/dev/usb/net/usb_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -219,7 +219,6 @@ ue_attach_post_task(struct usb_proc_msg *_task) ue->ue_ifp = ifp; error = ue->ue_methods->ue_attach_post_sub(ue); } else { - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; if (ue->ue_methods->ue_ioctl != NULL) ifp->if_ioctl = ue->ue_methods->ue_ioctl; diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c index 1ea0faf..090bb0c 100644 --- a/sys/dev/vx/if_vx.c +++ b/sys/dev/vx/if_vx.c @@ -188,7 +188,6 @@ vx_attach(device_t dev) eaddr[(i << 1) + 1] = x; } - ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_maxlen = ifqmaxlen; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = vx_start; diff --git a/sys/dev/vxge/vxge.c b/sys/dev/vxge/vxge.c index 94ca609..0750e35 100644 --- a/sys/dev/vxge/vxge.c +++ b/sys/dev/vxge/vxge.c @@ -1378,7 +1378,6 @@ vxge_ifp_setup(device_t ndev) /* Initialize interface ifnet structure */ if_initname(ifp, device_get_name(ndev), device_get_unit(ndev)); - ifp->if_mtu = ETHERMTU; ifp->if_baudrate = VXGE_BAUDRATE; ifp->if_init = vxge_init; ifp->if_softc = vdev; diff --git a/sys/dev/wb/if_wb.c b/sys/dev/wb/if_wb.c index 9c5cd95..43d721c 100644 --- a/sys/dev/wb/if_wb.c +++ b/sys/dev/wb/if_wb.c @@ -660,7 +660,6 @@ wb_attach(dev) } ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = wb_ioctl; ifp->if_start = wb_start; diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c index 6dfb1e9..b2be6e4 100644 --- a/sys/dev/xen/netback/netback.c +++ b/sys/dev/xen/netback/netback.c @@ -375,7 +375,6 @@ netif_create(int handle, struct xenbus_device *xdev, char *bridge) ifp->if_output = ether_output; ifp->if_start = netback_start; ifp->if_ioctl = netback_ioctl; - ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_maxlen = NET_TX_RING_SIZE - 1; DPRINTF("Created %s for domid=%d handle=%d\n", IFNAME(netif), netif->domid, netif->handle); diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index 8d6444a..7dd5639 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -2145,7 +2145,6 @@ create_netdev(device_t dev) ifp->if_watchdog = xn_watchdog; #endif ifp->if_init = xn_ifinit; - ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_maxlen = NET_TX_RING_SIZE - 1; ifp->if_hwassist = XN_CSUM_FEATURES; -- cgit v1.1