Author: yongari
Date: Fri Feb 26 20:39:07 2010
New Revision: 204371
URL: http://svn.freebsd.org/changeset/base/204371
Log:
Make toggling TSO, VLAN hardware checksum offloading work. Also fix
TX/RX checksum handler to set/clear relavant assist bits which was
used to cause unexpected results.
With this change, bce(4) can be bridged with other interfaces that
lack TSO, VLAN checksum offloading.
Reviewed by: davidch
Modified:
head/sys/dev/bce/if_bce.c
Modified: head/sys/dev/bce/if_bce.c
==============================================================================
--- head/sys/dev/bce/if_bce.c Fri Feb 26 20:26:17 2010 (r204370)
+++ head/sys/dev/bce/if_bce.c Fri Feb 26 20:39:07 2010 (r204371)
@@ -7102,33 +7102,35 @@ bce_ioctl(struct ifnet *ifp, u_long comm
mask = ifr->ifr_reqcap ^ ifp->if_capenable;
DBPRINT(sc, BCE_INFO_MISC, "Received SIOCSIFCAP =
0x%08X\n", (u32) mask);
- /* Toggle the TX checksum capabilites enable flag. */
- if (mask & IFCAP_TXCSUM) {
+ /* Toggle the TX checksum capabilities enable flag. */
+ if (mask & IFCAP_TXCSUM &&
+ ifp->if_capabilities & IFCAP_TXCSUM) {
ifp->if_capenable ^= IFCAP_TXCSUM;
if (IFCAP_TXCSUM & ifp->if_capenable)
- ifp->if_hwassist = BCE_IF_HWASSIST;
+ ifp->if_hwassist |= BCE_IF_HWASSIST;
else
- ifp->if_hwassist = 0;
+ ifp->if_hwassist &= ~BCE_IF_HWASSIST;
}
/* Toggle the RX checksum capabilities enable flag. */
- if (mask & IFCAP_RXCSUM) {
+ if (mask & IFCAP_RXCSUM &&
+ ifp->if_capabilities & IFCAP_RXCSUM)
ifp->if_capenable ^= IFCAP_RXCSUM;
- if (IFCAP_RXCSUM & ifp->if_capenable)
- ifp->if_hwassist = BCE_IF_HWASSIST;
- else
- ifp->if_hwassist = 0;
- }
/* Toggle the TSO capabilities enable flag. */
- if (bce_tso_enable && (mask & IFCAP_TSO4)) {
+ if (bce_tso_enable && (mask & IFCAP_TSO4) &&
+ ifp->if_capabilities & IFCAP_TSO4) {
ifp->if_capenable ^= IFCAP_TSO4;
- if (IFCAP_RXCSUM & ifp->if_capenable)
- ifp->if_hwassist = BCE_IF_HWASSIST;
+ if (IFCAP_TSO4 & ifp->if_capenable)
+ ifp->if_hwassist |= CSUM_TSO;
else
- ifp->if_hwassist = 0;
+ ifp->if_hwassist &= ~CSUM_TSO;
}
+ if (mask & IFCAP_VLAN_HWCSUM &&
+ ifp->if_capabilities & IFCAP_VLAN_HWCSUM)
+ ifp->if_capenable ^= IFCAP_VLAN_HWCSUM;
+
/*
* Don't actually disable VLAN tag stripping as
* management firmware (ASF/IPMI/UMP) requires the
_______________________________________________
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"
