diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-09-13 20:52:01 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-09-13 20:52:01 +0000 |
| commit | 727760a4e452031c6ff1856c341de106c671838e (patch) | |
| tree | f2a711c563349212d5fa8c8a4d2f0a78d82ace1e /sys/net/if_vlan.c | |
| parent | d999791b48275bcd322e001fb9096478bb0f0045 (diff) | |
| download | FreeBSD-src-727760a4e452031c6ff1856c341de106c671838e.zip FreeBSD-src-727760a4e452031c6ff1856c341de106c671838e.tar.gz | |
Revert r271504. A new patch to solve this issue will be made.
Suggested by: adrian @
Diffstat (limited to 'sys/net/if_vlan.c')
| -rw-r--r-- | sys/net/if_vlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index b7ccb61..5a5e712 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1557,8 +1557,8 @@ vlan_capabilities(struct ifvlan *ifv) * propagate the hardware-assisted flag. TSO on VLANs * does not necessarily require hardware VLAN tagging. */ - ifp->if_hw_tsomax = if_hw_tsomax_common(ifp->if_hw_tsomax, - p->if_hw_tsomax); + 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) { |
