* [PATCH net] sctp: fix the transport error_count check
@ 2019-08-12 12:49 Xin Long
2019-08-13 16:27 ` Marcelo Ricardo Leitner
0 siblings, 1 reply; 3+ messages in thread
From: Xin Long @ 2019-08-12 12:49 UTC (permalink / raw)
To: network dev, linux-sctp; +Cc: davem, Marcelo Ricardo Leitner, Neil Horman
As the annotation says in sctp_do_8_2_transport_strike():
"If the transport error count is greater than the pf_retrans
threshold, and less than pathmaxrtx ..."
It should be transport->error_count checked with pathmaxrxt,
instead of asoc->pf_retrans.
Fixes: 5aa93bcf66f4 ("sctp: Implement quick failover draft from tsvwg")
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 a554d6d..1cf5bb5 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -546,7 +546,7 @@ static void sctp_do_8_2_transport_strike(struct sctp_cmd_seq *commands,
*/
if (net->sctp.pf_enable &&
(transport->state == SCTP_ACTIVE) &&
- (asoc->pf_retrans < transport->pathmaxrxt) &&
+ (transport->error_count < transport->pathmaxrxt) &&
(transport->error_count > asoc->pf_retrans)) {
sctp_assoc_control_transport(asoc, transport,
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] sctp: fix the transport error_count check
2019-08-12 12:49 [PATCH net] sctp: fix the transport error_count check Xin Long
@ 2019-08-13 16:27 ` Marcelo Ricardo Leitner
2019-08-14 2:22 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Marcelo Ricardo Leitner @ 2019-08-13 16:27 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, davem, Neil Horman
On Mon, Aug 12, 2019 at 08:49:12PM +0800, Xin Long wrote:
> As the annotation says in sctp_do_8_2_transport_strike():
>
> "If the transport error count is greater than the pf_retrans
> threshold, and less than pathmaxrtx ..."
>
> It should be transport->error_count checked with pathmaxrxt,
> instead of asoc->pf_retrans.
>
> Fixes: 5aa93bcf66f4 ("sctp: Implement quick failover draft from tsvwg")
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Dave, please consider this one for stable. Thanks.
> ---
> 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 a554d6d..1cf5bb5 100644
> --- a/net/sctp/sm_sideeffect.c
> +++ b/net/sctp/sm_sideeffect.c
> @@ -546,7 +546,7 @@ static void sctp_do_8_2_transport_strike(struct sctp_cmd_seq *commands,
> */
> if (net->sctp.pf_enable &&
> (transport->state == SCTP_ACTIVE) &&
> - (asoc->pf_retrans < transport->pathmaxrxt) &&
> + (transport->error_count < transport->pathmaxrxt) &&
> (transport->error_count > asoc->pf_retrans)) {
>
> sctp_assoc_control_transport(asoc, transport,
> --
> 2.1.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] sctp: fix the transport error_count check
2019-08-13 16:27 ` Marcelo Ricardo Leitner
@ 2019-08-14 2:22 ` Jakub Kicinski
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2019-08-14 2:22 UTC (permalink / raw)
To: Marcelo Ricardo Leitner
Cc: Xin Long, network dev, linux-sctp, davem, Neil Horman
On Tue, 13 Aug 2019 13:27:34 -0300, Marcelo Ricardo Leitner wrote:
> On Mon, Aug 12, 2019 at 08:49:12PM +0800, Xin Long wrote:
> > As the annotation says in sctp_do_8_2_transport_strike():
> >
> > "If the transport error count is greater than the pf_retrans
> > threshold, and less than pathmaxrtx ..."
> >
> > It should be transport->error_count checked with pathmaxrxt,
> > instead of asoc->pf_retrans.
> >
> > Fixes: 5aa93bcf66f4 ("sctp: Implement quick failover draft from tsvwg")
> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
>
> Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Applied.
> Dave, please consider this one for stable. Thanks.
Ack.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-14 2:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-12 12:49 [PATCH net] sctp: fix the transport error_count check Xin Long
2019-08-13 16:27 ` Marcelo Ricardo Leitner
2019-08-14 2:22 ` Jakub Kicinski
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).