dccp/tcp: Remove NULL check for prev_saddr in inet_bhash2_update_saddr().

When we call inet_bhash2_update_saddr(), prev_saddr is always non-NULL.
Let's remove the unnecessary test.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Acked-by: Joanne Koong <joannelkoong@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 033bf3c..d745f96 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -877,13 +877,10 @@ int inet_bhash2_update_saddr(struct inet_bind_hashbucket *prev_saddr, struct soc
 
        head2 = inet_bhashfn_portaddr(hinfo, sk, net, port);
 
-       if (prev_saddr) {
-               spin_lock_bh(&prev_saddr->lock);
-               __sk_del_bind2_node(sk);
-               inet_bind2_bucket_destroy(hinfo->bind2_bucket_cachep,
-                                         inet_csk(sk)->icsk_bind2_hash);
-               spin_unlock_bh(&prev_saddr->lock);
-       }
+       spin_lock_bh(&prev_saddr->lock);
+       __sk_del_bind2_node(sk);
+       inet_bind2_bucket_destroy(hinfo->bind2_bucket_cachep, inet_csk(sk)->icsk_bind2_hash);
+       spin_unlock_bh(&prev_saddr->lock);
 
        spin_lock_bh(&head2->lock);
        tb2 = inet_bind2_bucket_find(head2, net, port, l3mdev, sk);