102c102
< __FBSDID("$FreeBSD: head/sys/dev/msk/if_msk.c 192720 2009-05-25 03:53:12Z yongari $");
---
> __FBSDID("$FreeBSD: head/sys/dev/msk/if_msk.c 192723 2009-05-25 04:22:27Z yongari $");
903a904
> MSK_IF_LOCK(sc_if);
907,915c908,921
< if ((sc_if->msk_flags & MSK_FLAG_NOJUMBO) != 0 &&
< ifr->ifr_mtu > ETHERMTU)
< error = EINVAL;
< else {
< MSK_IF_LOCK(sc_if);
< ifp->if_mtu = ifr->ifr_mtu;
< if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
< msk_init_locked(sc_if);
< MSK_IF_UNLOCK(sc_if);
---
> if (ifr->ifr_mtu > ETHERMTU) {
> if ((sc_if->msk_flags & MSK_FLAG_JUMBO) == 0) {
> error = EINVAL;
> MSK_IF_UNLOCK(sc_if);
> break;
> }
> if ((sc_if->msk_flags &
> MSK_FLAG_JUMBO_NOCSUM) != 0) {
> ifp->if_hwassist &=
> ~(MSK_CSUM_FEATURES | CSUM_TSO);
> ifp->if_capenable &=
> ~(IFCAP_TSO4 | IFCAP_TXCSUM);
> VLAN_CAPABILITIES(ifp);
> }
916a923,924
> ifp->if_mtu = ifr->ifr_mtu;
> msk_init_locked(sc_if);
917a926
> MSK_IF_UNLOCK(sc_if);
974,978c983
< sc_if->msk_softc->msk_hw_id == CHIP_ID_YUKON_EC_U) {
< /*
< * In Yukon EC Ultra, TSO & checksum offload is not
< * supported for jumbo frame.
< */
---
> (sc_if->msk_flags & MSK_FLAG_JUMBO_NOCSUM) != 0) {
1409,1412d1413
< /* Disable jumbo frame for Yukon FE. */
< if (sc_if->msk_softc->msk_hw_id == CHIP_ID_YUKON_FE)
< sc_if->msk_flags |= MSK_FLAG_NOJUMBO;
<
1611a1613,1615
> sc->msk_clock = 125; /* 125 Mhz */
> sc->msk_pflags |= MSK_FLAG_JUMBO;
> break;
1613a1618
> sc->msk_pflags |= MSK_FLAG_JUMBO | MSK_FLAG_JUMBO_NOCSUM;
1616a1622
> sc->msk_pflags |= MSK_FLAG_FASTETHER;
1619a1626
> sc->msk_pflags |= MSK_FLAG_JUMBO;
2161,2162c2168,2169
< if (jumbo_disable != 0 || (sc_if->msk_flags & MSK_FLAG_NOJUMBO) != 0) {
< sc_if->msk_flags |= MSK_FLAG_NOJUMBO;
---
> if (jumbo_disable != 0 || (sc_if->msk_flags & MSK_FLAG_JUMBO) == 0) {
> sc_if->msk_flags &= ~MSK_FLAG_JUMBO;
2165d2171
< sc_if->msk_flags |= MSK_FLAG_NOJUMBO;
2260c2266
< sc_if->msk_flags |= MSK_FLAG_NOJUMBO;
---
> sc_if->msk_flags &= ~MSK_FLAG_JUMBO;
3493,3497c3499
< sc_if->msk_softc->msk_hw_id == CHIP_ID_YUKON_EC_U) {
< /*
< * In Yukon EC Ultra, TSO & checksum offload is not
< * supported for jumbo frame.
< */
---
> (sc_if->msk_flags & MSK_FLAG_JUMBO_NOCSUM) != 0) {