tcp: move inet_reqsk_alloc() close to inet_reqsk_clone()

inet_reqsk_alloc() does not belong to tcp_input.c,
move it to inet_connection_sock.c instead.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index d81f74ce0f02e6a9432df49339b9a32a87965624..a9d2e630891003adaf3044306619aeeab87801a8 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -911,6 +911,31 @@ int inet_rtx_syn_ack(const struct sock *parent, struct request_sock *req)
 }
 EXPORT_SYMBOL(inet_rtx_syn_ack);
 
+struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
+                                     struct sock *sk_listener,
+                                     bool attach_listener)
+{
+       struct request_sock *req = reqsk_alloc(ops, sk_listener,
+                                              attach_listener);
+
+       if (req) {
+               struct inet_request_sock *ireq = inet_rsk(req);
+
+               ireq->ireq_opt = NULL;
+#if IS_ENABLED(CONFIG_IPV6)
+               ireq->pktopts = NULL;
+#endif
+               atomic64_set(&ireq->ir_cookie, 0);
+               ireq->ireq_state = TCP_NEW_SYN_RECV;
+               write_pnet(&ireq->ireq_net, sock_net(sk_listener));
+               ireq->ireq_family = sk_listener->sk_family;
+               req->timeout = TCP_TIMEOUT_INIT;
+       }
+
+       return req;
+}
+EXPORT_SYMBOL(inet_reqsk_alloc);
+
 static struct request_sock *inet_reqsk_clone(struct request_sock *req,
                                             struct sock *sk)
 {

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 212b6fd0caf76b0fb96f8dc06933f7680add3d26..eb187450e4d7666e6ff84f10be13d00f4400a25a 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -6986,31 +6986,6 @@ static void tcp_openreq_init(struct request_sock *req,
 #endif
 }
 
-struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
-                                     struct sock *sk_listener,
-                                     bool attach_listener)
-{
-       struct request_sock *req = reqsk_alloc(ops, sk_listener,
-                                              attach_listener);
-
-       if (req) {
-               struct inet_request_sock *ireq = inet_rsk(req);
-
-               ireq->ireq_opt = NULL;
-#if IS_ENABLED(CONFIG_IPV6)
-               ireq->pktopts = NULL;
-#endif
-               atomic64_set(&ireq->ir_cookie, 0);
-               ireq->ireq_state = TCP_NEW_SYN_RECV;
-               write_pnet(&ireq->ireq_net, sock_net(sk_listener));
-               ireq->ireq_family = sk_listener->sk_family;
-               req->timeout = TCP_TIMEOUT_INIT;
-       }
-
-       return req;
-}
-EXPORT_SYMBOL(inet_reqsk_alloc);
-
 /*
  * Return true if a syncookie should be sent
  */