diff options
| author | Vladislav Yasevich | 2005-11-12 01:06:16 +0100 |
|---|---|---|
| committer | David S. Miller | 2005-11-12 01:06:16 +0100 |
| commit | 1e7d3d90c95b32374057e454417b2f50440be20e (patch) | |
| tree | cd12fac53642654beb67924a6bf37b86b4b54b07 /net/sctp/sm_sideeffect.c | |
| parent | [SCTP]: Fix potential NULL pointer dereference in sctp_v4_get_saddr (diff) | |
| download | kernel-qcow2-linux-1e7d3d90c95b32374057e454417b2f50440be20e.tar.gz kernel-qcow2-linux-1e7d3d90c95b32374057e454417b2f50440be20e.tar.xz kernel-qcow2-linux-1e7d3d90c95b32374057e454417b2f50440be20e.zip | |
[SCTP]: Remove timeouts[] array from sctp_endpoint.
The socket level timeout values are maintained in sctp_sock and
association level timeouts are in sctp_association. So there is
no need for ep->timeouts.
Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
| -rw-r--r-- | net/sctp/sm_sideeffect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index f84173ea8ec1..823947170a33 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -385,7 +385,7 @@ sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = { NULL, sctp_generate_t4_rto_event, sctp_generate_t5_shutdown_guard_event, - sctp_generate_heartbeat_event, + NULL, sctp_generate_sack_event, sctp_generate_autoclose_event, }; @@ -689,9 +689,9 @@ static void sctp_cmd_new_state(sctp_cmd_seq_t *cmds, * increased due to timer expirations. */ asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_INIT] = - asoc->ep->timeouts[SCTP_EVENT_TIMEOUT_T1_INIT]; + asoc->rto_initial; asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_COOKIE] = - asoc->ep->timeouts[SCTP_EVENT_TIMEOUT_T1_COOKIE]; + asoc->rto_initial; } if (sctp_state(asoc, ESTABLISHED) || |