102c102
< __FBSDID("$FreeBSD: head/sys/dev/msk/if_msk.c 171509 2007-07-20 00:25:20Z yongari $");
---
> __FBSDID("$FreeBSD: head/sys/dev/msk/if_msk.c 173769 2007-11-20 06:20:02Z yongari $");
919c919
< if (sc_if->msk_softc->msk_hw_id == CHIP_ID_YUKON_EC_U &&
---
> if (sc_if->msk_softc->msk_hw_id == CHIP_ID_YUKON_FE &&
985a986,995
> if (sc_if->msk_framesize > MSK_MAX_FRAMELEN &&
> 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.
> */
> ifp->if_hwassist &= ~(MSK_CSUM_FEATURES | CSUM_TSO);
> ifp->if_capenable &= ~(IFCAP_TSO4 | IFCAP_TXCSUM);
> }
>
1456,1462c1466,1467
< ifp->if_capabilities = IFCAP_TXCSUM;
< ifp->if_hwassist = MSK_CSUM_FEATURES;
< if (sc->msk_hw_id != CHIP_ID_YUKON_EC_U) {
< /* It seems Yukon EC Ultra doesn't support TSO. */
< ifp->if_capabilities |= IFCAP_TSO4;
< ifp->if_hwassist |= CSUM_TSO;
< }
---
> ifp->if_capabilities = IFCAP_TXCSUM | IFCAP_TSO4;
> ifp->if_hwassist = MSK_CSUM_FEATURES | CSUM_TSO;
1507a1513,1515
> sc_if->msk_framesize = ifp->if_mtu + ETHER_HDR_LEN +
> ETHER_VLAN_ENCAP_LEN;
>
3708a3717,3725
> if (sc_if->msk_framesize > MSK_MAX_FRAMELEN &&
> 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.
> */
> ifp->if_hwassist &= ~(MSK_CSUM_FEATURES | CSUM_TSO);
> ifp->if_capenable &= ~(IFCAP_TSO4 | IFCAP_TXCSUM);
> }
3799,3801d3815
< /* XXX It seems STFW is requried for all cases. */
< CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, TX_GMF_CTRL_T), TX_STFW_ENA);
<
3810,3812d3823
< * Can't sure the following code is needed as Yukon
< * Yukon EC Ultra may not support jumbo frames.
< *
3816c3827
< MSK_ECU_AE_THR);
---
> MSK_ECU_JUMBO_WM << 16 | MSK_ECU_AE_THR);
3819c3830,3834
< TX_STFW_DIS);
---
> TX_JUMBO_ENA | TX_STFW_DIS);
> } else {
> /* Enable Store & Forward mode for Tx. */
> CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, TX_GMF_CTRL_T),
> TX_JUMBO_DIS | TX_STFW_ENA);