diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /net/sctp/sm_statefuns.c | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/sctp/sm_statefuns.c')
| -rw-r--r-- | net/sctp/sm_statefuns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index b8bbb960723c..5fb84778846d 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
| @@ -959,7 +959,7 @@ sctp_disposition_t sctp_sf_sendbeat_8_3(const struct sctp_endpoint *ep, | |||
| 959 | { | 959 | { |
| 960 | struct sctp_transport *transport = (struct sctp_transport *) arg; | 960 | struct sctp_transport *transport = (struct sctp_transport *) arg; |
| 961 | 961 | ||
| 962 | if (asoc->overall_error_count >= asoc->max_retrans) { | 962 | if (asoc->overall_error_count > asoc->max_retrans) { |
| 963 | sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR, | 963 | sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR, |
| 964 | SCTP_ERROR(ETIMEDOUT)); | 964 | SCTP_ERROR(ETIMEDOUT)); |
| 965 | /* CMD_ASSOC_FAILED calls CMD_DELETE_TCB. */ | 965 | /* CMD_ASSOC_FAILED calls CMD_DELETE_TCB. */ |