rxrpc: terminate retrans loop when sending of skb fails
Subsystems (3)
PATCH 1/2 rxrpc: terminate retrans loop when sending of skb fails
Typo, 'stop' is never set to true.
Seems intent is to not attempt to retransmit more packets after sendmsg returns an error.
This change is based on code inspection only.
--- net/rxrpc/ar-ack.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/rxrpc/ar-ack.c +4 -3
@@ -218,7 +218,8 @@ static void rxrpc_resend(struct rxrpc_call *call)struct rxrpc_header *hdr;struct sk_buff *txb;unsigned long *p_txb, resend_at; -int loop, stop; +bool stop; +int loop;u8 resend; _enter("{%d,%d,%d,%d},",
@@ -226,7 +227,7 @@ static void rxrpc_resend(struct rxrpc_call *call)atomic_read (&call->sequence), CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz)); - stop =0 ; + stop = false; resend =0 ; resend_at =0 ;
@@ -255,7 +256,7 @@ static void rxrpc_resend(struct rxrpc_call *call)_proto ("Tx DATA %%%u { #%d }" ,ntohl (sp->hdr.serial),ntohl (sp->hdr.seq));if (rxrpc_send_packet (call->conn->trans, txb) <0 ) { - stop =0 ; + stop = true; sp->resend_at = jiffies +3 ; }else { sp->resend_at =
Signature · 1 line
2.0.5
PATCH 2/2 rxrpc: don't multiply with HZ twice
rxrpc_resend_timeout has an initial value of 4 * HZ; use it as-is.
--- net/rxrpc/ar-ack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rxrpc/ar-ack.c +1 -1
@@ -260,7 +260,7 @@ static void rxrpc_resend(struct rxrpc_call *call) sp->resend_at = jiffies +3 ; }else { sp->resend_at = - jiffies + rxrpc_resend_timeout *HZ ; + jiffies + rxrpc_resend_timeout; } }
Signature · 1 line
2.0.5
Re: [PATCH 2/2] rxrpc: don't multiply with HZ twice
From: Florian Westphal <[email protected]>
Date: Sat, 28 Feb 2015 11:51:37 +0100
Quoted 3 lines
rxrpc_resend_timeouthas an initial value of 4 * HZ; use it as-is.Signed-off-by Florian Westphal <[email protected]>
Applied.
From: Florian Westphal <[email protected]>
Date: Sat, 28 Feb 2015 11:51:36 +0100
Quoted 7 lines
Typo, 'stop' is never set to true.
Seems intent is to not attempt to retransmit more packets after sendmsg returns an error.This change is based on code inspection only.
Signed-off-by Florian Westphal <[email protected]>
Applied.