* [net-next 1/1] tipc: embed jiffies in macro TIPC_BC_RETR_LIM
@ 2019-06-28 15:06 Jon Maloy
2019-06-29 11:07 ` Ying Xue
2019-07-02 2:12 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Jon Maloy @ 2019-06-28 15:06 UTC (permalink / raw)
To: davem, netdev
Cc: gordan.mihaljevic, tung.q.nguyen, hoang.h.le, jon.maloy,
canh.d.luu, ying.xue, tipc-discussion
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: Jon Maloy <jon.maloy@ericsson.com>
---
net/tipc/link.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index f8bf63b..66d3a07 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -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)
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [net-next 1/1] tipc: embed jiffies in macro TIPC_BC_RETR_LIM
2019-06-28 15:06 [net-next 1/1] tipc: embed jiffies in macro TIPC_BC_RETR_LIM Jon Maloy
@ 2019-06-29 11:07 ` Ying Xue
2019-07-02 2:12 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Ying Xue @ 2019-06-29 11:07 UTC (permalink / raw)
To: Jon Maloy, davem, netdev
Cc: gordan.mihaljevic, tung.q.nguyen, hoang.h.le, canh.d.luu,
tipc-discussion
On 6/28/19 11:06 PM, Jon Maloy wrote:
> 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: Jon Maloy <jon.maloy@ericsson.com>
Acked-by: Ying Xue <ying.xue@windriver.com>
> ---
> net/tipc/link.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/net/tipc/link.c b/net/tipc/link.c
> index f8bf63b..66d3a07 100644
> --- a/net/tipc/link.c
> +++ b/net/tipc/link.c
> @@ -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)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [net-next 1/1] tipc: embed jiffies in macro TIPC_BC_RETR_LIM
2019-06-28 15:06 [net-next 1/1] tipc: embed jiffies in macro TIPC_BC_RETR_LIM Jon Maloy
2019-06-29 11:07 ` Ying Xue
@ 2019-07-02 2:12 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2019-07-02 2:12 UTC (permalink / raw)
To: jon.maloy
Cc: netdev, gordan.mihaljevic, tung.q.nguyen, hoang.h.le, canh.d.luu,
ying.xue, tipc-discussion
From: Jon Maloy <jon.maloy@ericsson.com>
Date: Fri, 28 Jun 2019 17:06:20 +0200
> 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: Jon Maloy <jon.maloy@ericsson.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-02 2:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-28 15:06 [net-next 1/1] tipc: embed jiffies in macro TIPC_BC_RETR_LIM Jon Maloy
2019-06-29 11:07 ` Ying Xue
2019-07-02 2:12 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).