tcp: remove sk_check_csum_caps()

Since TCP relies on GSO, we do not need this helper anymore.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index f0f576ff5603eb0f282f37fbf76138a9bdd0f724..b9624581d639ff7f1f9466d7e7cd50c6b87cabf5 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1863,15 +1863,6 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
        sk->sk_route_caps &= ~flags;
 }
 
-static inline bool sk_check_csum_caps(struct sock *sk)
-{
-       return (sk->sk_route_caps & NETIF_F_HW_CSUM) ||
-              (sk->sk_family == PF_INET &&
-               (sk->sk_route_caps & NETIF_F_IP_CSUM)) ||
-              (sk->sk_family == PF_INET6 &&
-               (sk->sk_route_caps & NETIF_F_IPV6_CSUM));
-}
-
 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
                                           struct iov_iter *from, char *to,
                                           int copy, int offset)

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 6f35c12af85aaed5bbed5090c7d7e63a952b8dab..7c41402718876ef8adc7dc90cd51994e6a4fded9 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1063,8 +1063,7 @@ EXPORT_SYMBOL_GPL(do_tcp_sendpages);
 int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset,
                        size_t size, int flags)
 {
-       if (!(sk->sk_route_caps & NETIF_F_SG) ||
-           !sk_check_csum_caps(sk))
+       if (!(sk->sk_route_caps & NETIF_F_SG))
                return sock_no_sendpage_locked(sk, page, offset, size, flags);
 
        tcp_rate_check_app_limited(sk);  /* is sending application-limited? */
@@ -1190,7 +1189,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
                        goto out_err;
                }
 
-               zc = sk_check_csum_caps(sk) && sk->sk_route_caps & NETIF_F_SG;
+               zc = sk->sk_route_caps & NETIF_F_SG;
                if (!zc)
                        uarg->zerocopy = 0;
        }
@@ -1287,11 +1286,7 @@ new_segment:
                                goto wait_for_memory;
 
                        process_backlog = true;
-                       /*
-                        * Check whether we can use HW checksum.
-                        */
-                       if (sk_check_csum_caps(sk))
-                               skb->ip_summed = CHECKSUM_PARTIAL;
+                       skb->ip_summed = CHECKSUM_PARTIAL;
 
                        skb_entail(sk, skb);
                        copy = size_goal;