| Message ID | 9750de643075d301d80229898eacb0d921349f73.1439959083.git.lucien.xin@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Aug 19, 2015 at 12:38:03PM +0800, Xin Long wrote: > commit f8d960524 fix the 0 peer.rwnd issue in SHUTDOWN_PENING state > through not reseting the overall_error_count when recevie a heartbeat, > but the same issue also exists in SHUTDOWN_RECEIVE state. Please fix the typos on changelog, specially when regarding symbols so searching for them later is more successful. Also, to make changelog closer to the actual change, explaining why it's okay to include the other states in there too would be good, as you're including not only SHUTDOWN_RECEIVE but also SHUTDOWN_SENT and SHUTDOWN_ACK_SENT. > Fixes: f8d960524 ("sctp: Enforce retransmission limit during shutdown") > Signed-off-by: Xin Long <lucien.xin@gmail.com> > --- > net/sctp/sm_sideeffect.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c > index fef2acd..85e6f03 100644 > --- a/net/sctp/sm_sideeffect.c > +++ b/net/sctp/sm_sideeffect.c > @@ -702,7 +702,7 @@ static void sctp_cmd_transport_on(sctp_cmd_seq_t *cmds, > * outstanding data and rely on the retransmission limit be reached > * to shutdown the association. > */ > - if (t->asoc->state != SCTP_STATE_SHUTDOWN_PENDING) > + if (t->asoc->state < SCTP_STATE_SHUTDOWN_PENDING) > t->asoc->overall_error_count = 0; > > /* Clear the hb_sent flag to signal that we had a good > -- > 2.1.0 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index fef2acd..85e6f03 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -702,7 +702,7 @@ static void sctp_cmd_transport_on(sctp_cmd_seq_t *cmds, * outstanding data and rely on the retransmission limit be reached * to shutdown the association. */ - if (t->asoc->state != SCTP_STATE_SHUTDOWN_PENDING) + if (t->asoc->state < SCTP_STATE_SHUTDOWN_PENDING) t->asoc->overall_error_count = 0; /* Clear the hb_sent flag to signal that we had a good
commit f8d960524 fix the 0 peer.rwnd issue in SHUTDOWN_PENING state through not reseting the overall_error_count when recevie a heartbeat, but the same issue also exists in SHUTDOWN_RECEIVE state. Fixes: f8d960524 ("sctp: Enforce retransmission limit during shutdown") Signed-off-by: Xin Long <lucien.xin@gmail.com> --- net/sctp/sm_sideeffect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)