Author: yongari
Date: Fri Feb 26 17:33:43 2010
New Revision: 204362
URL: http://svn.freebsd.org/changeset/base/204362
Log:
Add TSO support on VLANs. Controller requires VLAN hardware tagging
to make TSO work over VLANs.
Modified:
head/sys/dev/msk/if_msk.c
Modified: head/sys/dev/msk/if_msk.c
==============================================================================
--- head/sys/dev/msk/if_msk.c Fri Feb 26 17:27:16 2010 (r204361)
+++ head/sys/dev/msk/if_msk.c Fri Feb 26 17:33:43 2010 (r204362)
@@ -1006,11 +1006,6 @@ msk_ioctl(struct ifnet *ifp, u_long comm
if ((mask & IFCAP_RXCSUM) != 0 &&
(IFCAP_RXCSUM & ifp->if_capabilities) != 0)
ifp->if_capenable ^= IFCAP_RXCSUM;
- if ((mask & IFCAP_VLAN_HWTAGGING) != 0 &&
- (IFCAP_VLAN_HWTAGGING & ifp->if_capabilities) != 0) {
- ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING;
- msk_setvlan(sc_if, ifp);
- }
if ((mask & IFCAP_VLAN_HWCSUM) != 0 &&
(IFCAP_VLAN_HWCSUM & ifp->if_capabilities) != 0)
ifp->if_capenable ^= IFCAP_VLAN_HWCSUM;
@@ -1022,6 +1017,16 @@ msk_ioctl(struct ifnet *ifp, u_long comm
else
ifp->if_hwassist &= ~CSUM_TSO;
}
+ if ((mask & IFCAP_VLAN_HWTSO) != 0 &&
+ (IFCAP_VLAN_HWTSO & ifp->if_capabilities) != 0)
+ ifp->if_capenable ^= IFCAP_VLAN_HWTSO;
+ if ((mask & IFCAP_VLAN_HWTAGGING) != 0 &&
+ (IFCAP_VLAN_HWTAGGING & ifp->if_capabilities) != 0) {
+ ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING;
+ if ((IFCAP_VLAN_HWTAGGING & ifp->if_capenable) == 0)
+ ifp->if_capenable &= ~IFCAP_VLAN_HWTSO;
+ msk_setvlan(sc_if, ifp);
+ }
if (ifp->if_mtu > ETHERMTU &&
(sc_if->msk_flags & MSK_FLAG_JUMBO_NOCSUM) != 0) {
ifp->if_hwassist &= ~(MSK_CSUM_FEATURES | CSUM_TSO);
@@ -1559,7 +1564,7 @@ msk_attach(device_t dev)
* this workaround does not work so disable checksum offload
* for VLAN interface.
*/
- ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING;
+ ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWTSO;
/*
* Enable Rx checksum offloading for VLAN taggedd frames
* if controller support new descriptor format.
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
