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

Commit 71fd762f authored May 18, 2014 by Manuel Schölling Committed by David S. Miller May 18, 2014

net: rds: Use time_after() for time comparison



To be future-proof and for better readability the time comparisons are modified
to use time_after() instead of raw math.

Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 03b8dcba

net/rds/ib_send.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -298,7 +298,7 @@ void rds_ib_send_cq_comp_handler(struct ib_cq cq, void context)
		rds_ib_stats_inc(s_ib_tx_cq_event);

		if (wc.wr_id == RDS_IB_ACK_WR_ID) {
		if (ic->i_ack_queued + HZ/2 < jiffies)
		if (time_after(jiffies, ic->i_ack_queued + HZ/2))
		rds_ib_stats_inc(s_ib_tx_stalled);
		rds_ib_ack_send_complete(ic);
		continue;
		@@ -315,7 +315,7 @@ void rds_ib_send_cq_comp_handler(struct ib_cq cq, void context)

		rm = rds_ib_send_unmap_op(ic, send, wc.status);

		if (send->s_queued + HZ/2 < jiffies)
		if (time_after(jiffies, send->s_queued + HZ/2))
		rds_ib_stats_inc(s_ib_tx_stalled);

		if (send->s_op) {

net/rds/iw_send.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -232,7 +232,7 @@ void rds_iw_send_cq_comp_handler(struct ib_cq cq, void context)
		}

		if (wc.wr_id == RDS_IW_ACK_WR_ID) {
		if (ic->i_ack_queued + HZ/2 < jiffies)
		if (time_after(jiffies, ic->i_ack_queued + HZ/2))
		rds_iw_stats_inc(s_iw_tx_stalled);
		rds_iw_ack_send_complete(ic);
		continue;
		@@ -267,7 +267,7 @@ void rds_iw_send_cq_comp_handler(struct ib_cq cq, void context)

		send->s_wr.opcode = 0xdead;
		send->s_wr.num_sge = 1;
		if (send->s_queued + HZ/2 < jiffies)
		if (time_after(jiffies, send->s_queued + HZ/2))
		rds_iw_stats_inc(s_iw_tx_stalled);

		/* If a RDMA operation produced an error, signal this right