Commit d0d598ca authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: remove sk_route_forced_caps 



We were only using one bit, and we can replace it by sk_is_tcp()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42f67eea

include/net/sock.h

+0 −3
Original line number Diff line number Diff line
@@ -285,8 +285,6 @@ struct bpf_local_storage; 
  *	@sk_no_check_rx: allow zero checksum in RX packets

  *	@sk_route_caps: route capabilities (e.g. %NETIF_F_TSO)

  *	@sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK)

  *	@sk_route_forced_caps: static, forced route capabilities

  *		(set in tcp_init_sock())

  *	@sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4)

  *	@sk_gso_max_size: Maximum GSO segment size to build

  *	@sk_gso_max_segs: Maximum number of GSO segments
@@ -461,7 +459,6 @@ struct sock { 
	struct page_frag	sk_frag;

	netdev_features_t	sk_route_caps;

	netdev_features_t	sk_route_nocaps;

	netdev_features_t	sk_route_forced_caps;

	int			sk_gso_type;

	unsigned int		sk_gso_max_size;

	gfp_t			sk_allocation;

net/core/sock.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv4/tcp.c

+0 −1
Original line number Diff line number Diff line
@@ -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);