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

Commit 2c589cf0 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

inet_diag: use jiffies_delta_to_msecs() 



[ Upstream commit 3828a93f5cfdf5d8a4ff9dead741e9a2871ff57b ]

Use jiffies_delta_to_msecs() to avoid reporting 'infinite'
timeouts and to cleanup code.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0d80462f

net/ipv4/inet_diag.c

+6 −9
Original line number Diff line number Diff line
@@ -240,17 +240,17 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, 
		r->idiag_timer = 1;

		r->idiag_retrans = icsk->icsk_retransmits;

		r->idiag_expires =

			jiffies_to_msecs(icsk->icsk_timeout - jiffies);

			jiffies_delta_to_msecs(icsk->icsk_timeout - jiffies);

	} else if (icsk->icsk_pending == ICSK_TIME_PROBE0) {

		r->idiag_timer = 4;

		r->idiag_retrans = icsk->icsk_probes_out;

		r->idiag_expires =

			jiffies_to_msecs(icsk->icsk_timeout - jiffies);

			jiffies_delta_to_msecs(icsk->icsk_timeout - jiffies);

	} else if (timer_pending(&sk->sk_timer)) {

		r->idiag_timer = 2;

		r->idiag_retrans = icsk->icsk_probes_out;

		r->idiag_expires =

			jiffies_to_msecs(sk->sk_timer.expires - jiffies);

			jiffies_delta_to_msecs(sk->sk_timer.expires - jiffies);

	} else {

		r->idiag_timer = 0;

		r->idiag_expires = 0;
@@ -338,16 +338,13 @@ static int inet_twsk_diag_fill(struct sock *sk, 
	r = nlmsg_data(nlh);

	BUG_ON(tw->tw_state != TCP_TIME_WAIT);



	tmo = tw->tw_timer.expires - jiffies;

	if (tmo < 0)

		tmo = 0;



	inet_diag_msg_common_fill(r, sk);

	r->idiag_retrans      = 0;



	r->idiag_state	      = tw->tw_substate;

	r->idiag_timer	      = 3;

	r->idiag_expires      = jiffies_to_msecs(tmo);

	tmo = tw->tw_timer.expires - jiffies;

	r->idiag_expires      = jiffies_delta_to_msecs(tmo);

	r->idiag_rqueue	      = 0;

	r->idiag_wqueue	      = 0;

	r->idiag_uid	      = 0;
@@ -381,7 +378,7 @@ static int inet_req_diag_fill(struct sock *sk, struct sk_buff *skb, 
		     offsetof(struct sock, sk_cookie));



	tmo = inet_reqsk(sk)->rsk_timer.expires - jiffies;

	r->idiag_expires = (tmo >= 0) ? jiffies_to_msecs(tmo) : 0;

	r->idiag_expires = jiffies_delta_to_msecs(tmo);

	r->idiag_rqueue	= 0;

	r->idiag_wqueue	= 0;

	r->idiag_uid	= 0;