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

Commit b7de529c authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

net: use jiffies_to_msecs to replace EXPIRES_IN_MS in inet/sctp_diag 



EXPIRES_IN_MS macro comes from net/ipv4/inet_diag.c and dates
back to before jiffies_to_msecs() has been introduced.

Now we can remove it and use jiffies_to_msecs().

Suggested-by: default avatarJakub Sitnicki <jkbs@redhat.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarJakub Sitnicki <jkbs@redhat.com>
Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85b67bcb

net/ipv4/inet_diag.c

+6 −6
Original line number Diff line number Diff line
@@ -197,27 +197,27 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, 
		goto out;

	}



#define EXPIRES_IN_MS(tmo)  DIV_ROUND_UP((tmo - jiffies) * 1000, HZ)



	if (icsk->icsk_pending == ICSK_TIME_RETRANS ||

	    icsk->icsk_pending == ICSK_TIME_EARLY_RETRANS ||

	    icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) {

		r->idiag_timer = 1;

		r->idiag_retrans = icsk->icsk_retransmits;

		r->idiag_expires = EXPIRES_IN_MS(icsk->icsk_timeout);

		r->idiag_expires =

			jiffies_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 = EXPIRES_IN_MS(icsk->icsk_timeout);

		r->idiag_expires =

			jiffies_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 = EXPIRES_IN_MS(sk->sk_timer.expires);

		r->idiag_expires =

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

	} else {

		r->idiag_timer = 0;

		r->idiag_expires = 0;

	}

#undef EXPIRES_IN_MS



	if ((ext & (1 << (INET_DIAG_INFO - 1))) && handler->idiag_info_size) {

		attr = nla_reserve(skb, INET_DIAG_INFO,

net/sctp/sctp_diag.c

+2 −4
Original line number Diff line number Diff line
@@ -48,10 +48,8 @@ static void inet_diag_msg_sctpasoc_fill(struct inet_diag_msg *r, 
	r->idiag_state = asoc->state;

	r->idiag_timer = SCTP_EVENT_TIMEOUT_T3_RTX;

	r->idiag_retrans = asoc->rtx_data_chunks;

#define EXPIRES_IN_MS(tmo)  DIV_ROUND_UP((tmo - jiffies) * 1000, HZ)

	r->idiag_expires =

		EXPIRES_IN_MS(asoc->timeouts[SCTP_EVENT_TIMEOUT_T3_RTX]);

#undef EXPIRES_IN_MS

	r->idiag_expires = jiffies_to_msecs(

		asoc->timeouts[SCTP_EVENT_TIMEOUT_T3_RTX] - jiffies);

}



static int inet_diag_msg_sctpladdrs_fill(struct sk_buff *skb,