diff options
| author | Eric Dumazet <[email protected]> | 2021-11-15 19:02:35 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2021-11-16 13:10:34 +0000 |
| commit | aba546565b613e74b84b8261999ea82b5561d3f1 (patch) | |
| tree | 4831996bbc6768b246767be29c5dd16ec2776f9c /net/core/sock.c | |
| parent | net: remove sk_route_forced_caps (diff) | |
| download | kernel-aba546565b613e74b84b8261999ea82b5561d3f1.tar.gz kernel-aba546565b613e74b84b8261999ea82b5561d3f1.zip | |
net: remove sk_route_nocaps
Instead of using a full netdev_features_t, we can use a single bit,
as sk_route_nocaps is only used to remove NETIF_F_GSO_MASK from
sk->sk_route_cap.
Signed-off-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 257b5fa60480..99738e14224c 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2249,7 +2249,8 @@ void sk_setup_caps(struct sock *sk, struct dst_entry *dst) sk->sk_route_caps |= NETIF_F_GSO; if (sk->sk_route_caps & NETIF_F_GSO) sk->sk_route_caps |= NETIF_F_GSO_SOFTWARE; - sk->sk_route_caps &= ~sk->sk_route_nocaps; + if (unlikely(sk->sk_gso_disabled)) + sk->sk_route_caps &= ~NETIF_F_GSO_MASK; if (sk_can_gso(sk)) { if (dst->header_len && !xfrm_dst_offload_ok(dst)) { sk->sk_route_caps &= ~NETIF_F_GSO_MASK; |