From bd9fd667c40125890c225d47386dd56b566f828c Mon Sep 17 00:00:00 2001 From: Rick Macklem Date: Tue, 15 Apr 2014 21:48:35 +0000 Subject: [PATCH] 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 --- sys/net/if_vlan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 75699fb8ff25..00d99ed777bf 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -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) {