diff options
| author | Eric Dumazet <edumazet@google.com> | 2021-11-15 22:02:34 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-16 16:10:34 +0300 |
| commit | d0d598ca86bd9e595f16a39097707c90841afe80 (patch) | |
| tree | 71d7a09dfc6f2ddd2c31ec50763e8460bb906009 /net | |
| parent | 42f67eea3ba36cef2dce2e853de6ddcb2e89eb39 (diff) | |
| download | linux-d0d598ca86bd9e595f16a39097707c90841afe80.tar.xz | |
net: remove sk_route_forced_caps
We were only using one bit, and we can replace it by sk_is_tcp()
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 4 | ||||
| -rw-r--r-- | net/ipv4/tcp.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 0be8e43f44b9..257b5fa60480 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2244,7 +2244,9 @@ void sk_setup_caps(struct sock *sk, struct dst_entry *dst) u32 max_segs = 1; sk_dst_set(sk, dst); - sk->sk_route_caps = dst->dev->features | sk->sk_route_forced_caps; + sk->sk_route_caps = dst->dev->features; + if (sk_is_tcp(sk)) + 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; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b7796b4cf0a0..4fa4b29260bd 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -456,7 +456,6 @@ void tcp_init_sock(struct sock *sk) WRITE_ONCE(sk->sk_rcvbuf, sock_net(sk)->ipv4.sysctl_tcp_rmem[1]); sk_sockets_allocated_inc(sk); - sk->sk_route_forced_caps = NETIF_F_GSO; } EXPORT_SYMBOL(tcp_init_sock); |