Re: [PATCH net] sctp: start t5 timer only when peer.rwnd == 0 and in SHUTDOWN_PENDING

2015-08-19 Thread Marcelo Ricardo Leitner 
On Wed, Aug 19, 2015 at 12:39:06PM +0800, Xin Long wrote:
 when A send a data to B, A close() to be in SHUTDOWN_PENDING state,
 but B neither claim his rwnd is 0 nor SACK this data, then A keep
 retransmiting this data. it should send abord after Max.Retrans
 times, only when peer.rwnd == 0 and more than Max.Retrans times, it
 will start t5 timer.
 
 Fixes: f8d960524 (sctp: Enforce retransmission limit during shutdown)
 Signed-off-by: Xin Long lucien@gmail.com
 ---

changelog is confusing, please reword it, specially the last part.

  net/sctp/sm_statefuns.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
 index 3ee27b7..7d9380c 100644
 --- a/net/sctp/sm_statefuns.c
 +++ b/net/sctp/sm_statefuns.c
 @@ -5412,7 +5412,8 @@ sctp_disposition_t sctp_sf_do_6_3_3_rtx(struct net *net,
   SCTP_INC_STATS(net, SCTP_MIB_T3_RTX_EXPIREDS);
  
   if (asoc-overall_error_count = asoc-max_retrans) {
 - if (asoc-state == SCTP_STATE_SHUTDOWN_PENDING) {
 + if (!q-asoc-peer.rwnd 
 + asoc-state == SCTP_STATE_SHUTDOWN_PENDING) {
^

Indentation issue here. 2nd if line should start where I marked.

Other than that, looks good to me.

   /*
* We are here likely because the receiver had its rwnd
* closed for a while and we have not been able to
 -- 
 2.1.0
 
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH net] sctp: start t5 timer only when peer.rwnd == 0 and in SHUTDOWN_PENDING

2015-08-18 Thread Xin Long 
when A send a data to B, A close() to be in SHUTDOWN_PENDING state,
but B neither claim his rwnd is 0 nor SACK this data, then A keep
retransmiting this data. it should send abord after Max.Retrans
times, only when peer.rwnd == 0 and more than Max.Retrans times, it
will start t5 timer.

Fixes: f8d960524 (sctp: Enforce retransmission limit during shutdown)
Signed-off-by: Xin Long lucien@gmail.com
---
 net/sctp/sm_statefuns.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 3ee27b7..7d9380c 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -5412,7 +5412,8 @@ sctp_disposition_t sctp_sf_do_6_3_3_rtx(struct net *net,
SCTP_INC_STATS(net, SCTP_MIB_T3_RTX_EXPIREDS);
 
if (asoc-overall_error_count = asoc-max_retrans) {
-   if (asoc-state == SCTP_STATE_SHUTDOWN_PENDING) {
+   if (!q-asoc-peer.rwnd 
+   asoc-state == SCTP_STATE_SHUTDOWN_PENDING) {
/*
 * We are here likely because the receiver had its rwnd
 * closed for a while and we have not been able to
-- 
2.1.0

--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html