tcp: Clean up some functions.

[platform/kernel/linux-starfive.git] / net / ipv4 / inet_connection_sock.c

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index f003804..8e71d65 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -286,15 +286,13 @@ inet_csk_find_open_port(const struct sock *sk, struct inet_bind_bucket **tb_ret,
                        struct inet_bind_hashbucket **head2_ret, int *port_ret)
 {
        struct inet_hashinfo *hinfo = sk->sk_prot->h.hashinfo;
-       int port = 0;
+       int i, low, high, attempt_half, port, l3mdev;
        struct inet_bind_hashbucket *head, *head2;
        struct net *net = sock_net(sk);
-       bool relax = false;
-       int i, low, high, attempt_half;
        struct inet_bind2_bucket *tb2;
        struct inet_bind_bucket *tb;
        u32 remaining, offset;
-       int l3mdev;
+       bool relax = false;
 
        l3mdev = inet_sk_bound_l3mdev(sk);
 ports_exhausted:
@@ -471,15 +469,14 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum)
 {
        bool reuse = sk->sk_reuse && sk->sk_state != TCP_LISTEN;
        struct inet_hashinfo *hinfo = sk->sk_prot->h.hashinfo;
-       int ret = 1, port = snum;
-       struct net *net = sock_net(sk);
        bool found_port = false, check_bind_conflict = true;
        bool bhash_created = false, bhash2_created = false;
        struct inet_bind_hashbucket *head, *head2;
        struct inet_bind2_bucket *tb2 = NULL;
        struct inet_bind_bucket *tb = NULL;
        bool head2_lock_acquired = false;
-       int l3mdev;
+       int ret = 1, port = snum, l3mdev;
+       struct net *net = sock_net(sk);
 
        l3mdev = inet_sk_bound_l3mdev(sk);
 
@@ -909,14 +906,16 @@ static void reqsk_migrate_reset(struct request_sock *req)
 /* return true if req was found in the ehash table */
 static bool reqsk_queue_unlink(struct request_sock *req)
 {
-       struct inet_hashinfo *hashinfo = req_to_sk(req)->sk_prot->h.hashinfo;
+       struct sock *sk = req_to_sk(req);
        bool found = false;
 
-       if (sk_hashed(req_to_sk(req))) {
-               spinlock_t *lock = inet_ehash_lockp(hashinfo, req->rsk_hash);
+       if (sk_hashed(sk)) {
+               struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
+               spinlock_t *lock;
 
+               lock = inet_ehash_lockp(hashinfo, req->rsk_hash);
                spin_lock(lock);
-               found = __sk_nulls_del_node_init_rcu(req_to_sk(req));
+               found = __sk_nulls_del_node_init_rcu(sk);
                spin_unlock(lock);
        }
        if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer))