Commit 7ffa2e90 authored by Jon Grimm's avatar Jon Grimm

[SCTP] Don't use path thresholds determine the overall error thresh.

This was too cautious; let the user set what they really want.  This
is preventing the Lockheed folks from doing interesting failover tests
setting all path_retrans to 0 (for immediate failover). 
parent b9c887f4
...@@ -142,7 +142,7 @@ struct sctp_association *sctp_association_init(struct sctp_association *asoc, ...@@ -142,7 +142,7 @@ struct sctp_association *sctp_association_init(struct sctp_association *asoc,
asoc->rto_max = proto->rto_max; asoc->rto_max = proto->rto_max;
asoc->rto_min = proto->rto_min; asoc->rto_min = proto->rto_min;
asoc->overall_error_threshold = 0; asoc->overall_error_threshold = asoc->max_retrans;
asoc->overall_error_count = 0; asoc->overall_error_count = 0;
/* Initialize the maximum mumber of new data packets that can be sent /* Initialize the maximum mumber of new data packets that can be sent
...@@ -478,16 +478,8 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc, ...@@ -478,16 +478,8 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
peer->partial_bytes_acked = 0; peer->partial_bytes_acked = 0;
peer->flight_size = 0; peer->flight_size = 0;
peer->error_threshold = peer->max_retrans; peer->error_threshold = peer->max_retrans;
/* Update the overall error threshold value of the association
* taking the new peer's error threshold into account.
*/
asoc->overall_error_threshold =
min(asoc->overall_error_threshold + peer->error_threshold,
asoc->max_retrans);
/* By default, enable heartbeat for peer address. */ /* By default, enable heartbeat for peer address. */
peer->hb_allowed = 1; peer->hb_allowed = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment