[SOCK]: Introduce sk_setup_caps

From tcp_v4_setup_caps, that always is preceded by a call to
__sk_dst_set, so coalesce this sequence into sk_setup_caps, removing
one call to a TCP function in the IP layer.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 10 insertions, 9 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index f91ee82522ff..69d869e41c35 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1025,6 +1025,16 @@ sk_dst_check(struct sock *sk, u32 cookie)
         return dst;
 }
 
+static inline void sk_setup_caps(struct sock *sk, struct dst_entry *dst)
+{
+        __sk_dst_set(sk, dst);
+        sk->sk_route_caps = dst->dev->features;
+        if (sk->sk_route_caps & NETIF_F_TSO) {
+                if (sock_flag(sk, SOCK_NO_LARGESEND) || dst->header_len)
+                        sk->sk_route_caps &= ~NETIF_F_TSO;
+        }
+}
+
 static inline void sk_charge_skb(struct sock *sk, struct sk_buff *skb)
 {
         sk->sk_wmem_queued   += skb->truesize;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 31984733777b..d95661a3aeeb 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1658,15 +1658,6 @@ static inline int tcp_paws_check(const struct tcp_options_received *rx_opt, int
         return 1;
 }
 
-static inline void tcp_v4_setup_caps(struct sock *sk, struct dst_entry *dst)
-{
-        sk->sk_route_caps = dst->dev->features;
-        if (sk->sk_route_caps & NETIF_F_TSO) {
-                if (sock_flag(sk, SOCK_NO_LARGESEND) || dst->header_len)
-                        sk->sk_route_caps &= ~NETIF_F_TSO;
-        }
-}
-
 #define TCP_CHECK_TIMER(sk) do { } while (0)
 
 static inline int tcp_use_frto(const struct sock *sk)