Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29ba4fff authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

net: tcp: refactor reinitialization of congestion control 



We can just move this to an extra function and make the code
a bit more readable, no functional change.

Joint work with Florian Westphal.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e715b6d3

net/ipv4/tcp_cong.c

+14 −10
Original line number Diff line number Diff line
@@ -107,6 +107,18 @@ void tcp_init_congestion_control(struct sock *sk) 
		icsk->icsk_ca_ops->init(sk);

}



static void tcp_reinit_congestion_control(struct sock *sk,

					  const struct tcp_congestion_ops *ca)

{

	struct inet_connection_sock *icsk = inet_csk(sk);



	tcp_cleanup_congestion_control(sk);

	icsk->icsk_ca_ops = ca;



	if (sk->sk_state != TCP_CLOSE && icsk->icsk_ca_ops->init)

		icsk->icsk_ca_ops->init(sk);

}



/* Manage refcounts on socket close. */

void tcp_cleanup_congestion_control(struct sock *sk)

{
@@ -262,21 +274,13 @@ int tcp_set_congestion_control(struct sock *sk, const char *name) 
#endif

	if (!ca)

		err = -ENOENT;



	else if (!((ca->flags & TCP_CONG_NON_RESTRICTED) ||

		   ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)))

		err = -EPERM;



	else if (!try_module_get(ca->owner))

		err = -EBUSY;



	else {

		tcp_cleanup_congestion_control(sk);

		icsk->icsk_ca_ops = ca;



		if (sk->sk_state != TCP_CLOSE && icsk->icsk_ca_ops->init)

			icsk->icsk_ca_ops->init(sk);

	}

	else

		tcp_reinit_congestion_control(sk, ca);

 out:

	rcu_read_unlock();

	return err;