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

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
...@@ -207,7 +207,7 @@ enum { ...@@ -207,7 +207,7 @@ enum {
BC_NACK_SND_SUPPRESS, 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)) #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, ...@@ -976,8 +976,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
__skb_queue_tail(transmq, skb); __skb_queue_tail(transmq, skb);
/* next retransmit attempt */ /* next retransmit attempt */
if (link_is_bc_sndlink(l)) if (link_is_bc_sndlink(l))
TIPC_SKB_CB(skb)->nxt_retr = TIPC_SKB_CB(skb)->nxt_retr = TIPC_BC_RETR_LIM;
jiffies + TIPC_BC_RETR_LIM;
__skb_queue_tail(xmitq, _skb); __skb_queue_tail(xmitq, _skb);
TIPC_SKB_CB(skb)->ackers = l->ackers; TIPC_SKB_CB(skb)->ackers = l->ackers;
l->rcv_unacked = 0; l->rcv_unacked = 0;
...@@ -1027,7 +1026,7 @@ static void tipc_link_advance_backlog(struct tipc_link *l, ...@@ -1027,7 +1026,7 @@ static void tipc_link_advance_backlog(struct tipc_link *l,
__skb_queue_tail(&l->transmq, skb); __skb_queue_tail(&l->transmq, skb);
/* next retransmit attempt */ /* next retransmit attempt */
if (link_is_bc_sndlink(l)) 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); __skb_queue_tail(xmitq, _skb);
TIPC_SKB_CB(skb)->ackers = l->ackers; 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, ...@@ -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 (link_is_bc_sndlink(l)) {
if (time_before(jiffies, TIPC_SKB_CB(skb)->nxt_retr)) if (time_before(jiffies, TIPC_SKB_CB(skb)->nxt_retr))
continue; 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); _skb = __pskb_copy(skb, LL_MAX_HEADER + MIN_H_SIZE, GFP_ATOMIC);
if (!_skb) if (!_skb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment