svn commit: r264517 - head/sys/net

[Rick Macklem]

Author: rmacklem
Date: Tue Apr 15 21:48:35 2014
New Revision: 264517
URL: http://svnweb.freebsd.org/changeset/base/264517

Log:
  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.
  
  Reviewed by:	glebius
  MFC after:	2 weeks

Modified:
  head/sys/net/if_vlan.c

Modified: head/sys/net/if_vlan.c
==============================================================================
--- head/sys/net/if_vlan.c	Tue Apr 15 20:53:53 2014	(r264516)
+++ head/sys/net/if_vlan.c	Tue Apr 15 21:48:35 2014	(r264517)
@@ -1511,6 +1511,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) {