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

Commit 53962bce authored by Jon Maloy's avatar Jon Maloy Committed by David S. Miller
Browse files

tipc: embed jiffies in macro TIPC_BC_RETR_LIM 



The macro TIPC_BC_RETR_LIM is always used in combination with 'jiffies',
so we can just as well perform the addition in the macro itself. This
way, we get a few shorter code lines and one less line break.

Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Acked-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 00dc3307

net/tipc/link.c

+4 −5
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ enum { 
	BC_NACK_SND_SUPPRESS,

};



#define TIPC_BC_RETR_LIM msecs_to_jiffies(10)   /* [ms] */

#define TIPC_BC_RETR_LIM  (jiffies + msecs_to_jiffies(10))

#define TIPC_UC_RETR_TIME (jiffies + msecs_to_jiffies(1))



/*
@@ -976,8 +976,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list, 
			__skb_queue_tail(transmq, skb);

			/* next retransmit attempt */

			if (link_is_bc_sndlink(l))

				TIPC_SKB_CB(skb)->nxt_retr =

					jiffies + TIPC_BC_RETR_LIM;

				TIPC_SKB_CB(skb)->nxt_retr = TIPC_BC_RETR_LIM;

			__skb_queue_tail(xmitq, _skb);

			TIPC_SKB_CB(skb)->ackers = l->ackers;

			l->rcv_unacked = 0;
@@ -1027,7 +1026,7 @@ static void tipc_link_advance_backlog(struct tipc_link *l, 
		__skb_queue_tail(&l->transmq, skb);

		/* next retransmit attempt */

		if (link_is_bc_sndlink(l))

			TIPC_SKB_CB(skb)->nxt_retr = jiffies + TIPC_BC_RETR_LIM;

			TIPC_SKB_CB(skb)->nxt_retr = TIPC_BC_RETR_LIM;



		__skb_queue_tail(xmitq, _skb);

		TIPC_SKB_CB(skb)->ackers = l->ackers;
@@ -1123,7 +1122,7 @@ static int tipc_link_bc_retrans(struct tipc_link *l, struct tipc_link *r, 
		if (link_is_bc_sndlink(l)) {

			if (time_before(jiffies, TIPC_SKB_CB(skb)->nxt_retr))

				continue;

			TIPC_SKB_CB(skb)->nxt_retr = jiffies + TIPC_BC_RETR_LIM;

			TIPC_SKB_CB(skb)->nxt_retr = TIPC_BC_RETR_LIM;

		}

		_skb = __pskb_copy(skb, LL_MAX_HEADER + MIN_H_SIZE, GFP_ATOMIC);

		if (!_skb)