diff options
| author | Alexander Duyck <aduyck@mirantis.com> | 2016-05-02 09:38:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-04 13:32:27 -0400 |
| commit | b1dc497b28ad053d1f6d5b5cb186af9564e4d7f1 (patch) | |
| tree | 3bac79c9ae7ede9897b691687ef9bf21791c274e | |
| parent | 36c983824b6f17b93258153ff5b05c33c34e44ba (diff) | |
| download | op-kernel-dev-b1dc497b28ad053d1f6d5b5cb186af9564e4d7f1.zip op-kernel-dev-b1dc497b28ad053d1f6d5b5cb186af9564e4d7f1.tar.gz | |
net: Fix netdev_fix_features so that TSO_MANGLEID is only available with TSO
This change makes it so that we will strip the TSO_MANGLEID bit if TSO is
not present. This way we will also handle ECN correctly of TSO is not
present.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 673d1f1..e98ba63 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6721,6 +6721,10 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, features &= ~NETIF_F_TSO6; } + /* TSO with IPv4 ID mangling requires IPv4 TSO be enabled */ + if ((features & NETIF_F_TSO_MANGLEID) && !(features & NETIF_F_TSO)) + features &= ~NETIF_F_TSO_MANGLEID; + /* TSO ECN requires that TSO is present as well. */ if ((features & NETIF_F_ALL_TSO) == NETIF_F_TSO_ECN) features &= ~NETIF_F_TSO_ECN; |
