svn commit: r265413 - stable/10/sys/net

[Rick Macklem]

Author: rmacklem
Date: Tue May  6 02:49:31 2014
New Revision: 265413
URL: http://svnweb.freebsd.org/changeset/base/265413

Log:
  MFC: r264517
  Vlan did not set the value of if_hw_tsomax, so when vlan
  was stacked on top of a network interface that set if_hw_tsomax,
  tcp_output() would see the default value instead of the value
  set by the network interface. This patch modifies vlan so that
  it sets if_hw_tsomax to the value of the parent interface.

Modified:
  stable/10/sys/net/if_vlan.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net/if_vlan.c
==============================================================================
--- stable/10/sys/net/if_vlan.c	Tue May  6 02:44:01 2014	(r265412)
+++ stable/10/sys/net/if_vlan.c	Tue May  6 02:49:31 2014	(r265413)
@@ -1509,6 +1509,8 @@ vlan_capabilities(struct ifvlan *ifv)
 	 * propagate the hardware-assisted flag. TSO on VLANs
 	 * does not necessarily require hardware VLAN tagging.
 	 */
+	if (p->if_hw_tsomax > 0)
+		ifp->if_hw_tsomax = p->if_hw_tsomax;
 	if (p->if_capabilities & IFCAP_VLAN_HWTSO)
 		ifp->if_capabilities |= p->if_capabilities & IFCAP_TSO;
 	if (p->if_capenable & IFCAP_VLAN_HWTSO) {