diff options
| author | David S. Miller <davem@davemloft.net> | 2022-05-06 12:07:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-05-06 12:07:56 +0100 |
| commit | 95730d65708397828f75ca7dbca838edf6727bfd (patch) | |
| tree | 37f896eb09e44bcaaa344a03a96052843a4dbd90 /net/8021q/vlan_dev.c | |
| parent | beb21e3e8e261fc9f11050af17efe6de183b33d3 (diff) | |
| parent | 744d49daf8bd3b17b345c836f2e6f97d49fa6ae8 (diff) | |
Merge branch 'tso-gso-limit-split'
Jakub Kicinski says:
====================
net: disambiguate the TSO and GSO limits
This series separates the device-reported TSO limitations
from the user space-controlled GSO limits. It used to be that
we only had the former (HW limits) but they were named GSO.
This probably lead to confusion and letting user override them.
The problem came up in the BIG TCP discussion between Eric and
Alex, and seems like something we should address.
Targeting net-next because (a) nobody is reporting problems;
and (b) there is a tiny but non-zero chance that some actually
wants to lift the HW limitations.
====================
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index e5d23e75572a..839f2020b015 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -573,8 +573,7 @@ static int vlan_dev_init(struct net_device *dev) NETIF_F_ALL_FCOE; dev->features |= dev->hw_features | NETIF_F_LLTX; - netif_set_gso_max_size(dev, real_dev->gso_max_size); - netif_set_gso_max_segs(dev, real_dev->gso_max_segs); + netif_inherit_tso_max(dev, real_dev); if (dev->features & NETIF_F_VLAN_FEATURES) netdev_warn(real_dev, "VLAN features are set incorrectly. Q-in-Q configurations may not work correctly.\n"); |