summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2014-05-06 02:49:31 +0000
committerrmacklem <rmacklem@FreeBSD.org>2014-05-06 02:49:31 +0000
commita54326376af297e38afd4198c82690c12c6bd2a8 (patch)
tree42f13be9506ef2efc88074e5eee8bde8577ed712 /sys/net
parent1f951a5c9bcb6797397deb96e9da7568e440ceec (diff)
downloadFreeBSD-src-a54326376af297e38afd4198c82690c12c6bd2a8.zip
FreeBSD-src-a54326376af297e38afd4198c82690c12c6bd2a8.tar.gz
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.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_vlan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index b7f1197..e9216db 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -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) {
OpenPOWER on IntegriCloud