diff options
Diffstat (limited to 'net/sctp/sm_statefuns.c')
-rw-r--r-- | net/sctp/sm_statefuns.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index ead3f1b0ea3d..5b5ae7958322 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
@@ -4031,18 +4031,12 @@ sctp_disposition_t sctp_sf_do_9_1_prm_abort( | |||
4031 | * from its upper layer, but retransmits data to the far end | 4031 | * from its upper layer, but retransmits data to the far end |
4032 | * if necessary to fill gaps. | 4032 | * if necessary to fill gaps. |
4033 | */ | 4033 | */ |
4034 | struct msghdr *msg = arg; | 4034 | struct sctp_chunk *abort = arg; |
4035 | struct sctp_chunk *abort; | ||
4036 | sctp_disposition_t retval; | 4035 | sctp_disposition_t retval; |
4037 | 4036 | ||
4038 | retval = SCTP_DISPOSITION_CONSUME; | 4037 | retval = SCTP_DISPOSITION_CONSUME; |
4039 | 4038 | ||
4040 | /* Generate ABORT chunk to send the peer. */ | 4039 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort)); |
4041 | abort = sctp_make_abort_user(asoc, NULL, msg); | ||
4042 | if (!abort) | ||
4043 | retval = SCTP_DISPOSITION_NOMEM; | ||
4044 | else | ||
4045 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort)); | ||
4046 | 4040 | ||
4047 | /* Even if we can't send the ABORT due to low memory delete the | 4041 | /* Even if we can't send the ABORT due to low memory delete the |
4048 | * TCB. This is a departure from our typical NOMEM handling. | 4042 | * TCB. This is a departure from our typical NOMEM handling. |
@@ -4166,8 +4160,7 @@ sctp_disposition_t sctp_sf_cookie_wait_prm_abort( | |||
4166 | void *arg, | 4160 | void *arg, |
4167 | sctp_cmd_seq_t *commands) | 4161 | sctp_cmd_seq_t *commands) |
4168 | { | 4162 | { |
4169 | struct msghdr *msg = arg; | 4163 | struct sctp_chunk *abort = arg; |
4170 | struct sctp_chunk *abort; | ||
4171 | sctp_disposition_t retval; | 4164 | sctp_disposition_t retval; |
4172 | 4165 | ||
4173 | /* Stop T1-init timer */ | 4166 | /* Stop T1-init timer */ |
@@ -4175,12 +4168,7 @@ sctp_disposition_t sctp_sf_cookie_wait_prm_abort( | |||
4175 | SCTP_TO(SCTP_EVENT_TIMEOUT_T1_INIT)); | 4168 | SCTP_TO(SCTP_EVENT_TIMEOUT_T1_INIT)); |
4176 | retval = SCTP_DISPOSITION_CONSUME; | 4169 | retval = SCTP_DISPOSITION_CONSUME; |
4177 | 4170 | ||
4178 | /* Generate ABORT chunk to send the peer */ | 4171 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort)); |
4179 | abort = sctp_make_abort_user(asoc, NULL, msg); | ||
4180 | if (!abort) | ||
4181 | retval = SCTP_DISPOSITION_NOMEM; | ||
4182 | else | ||
4183 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort)); | ||
4184 | 4172 | ||
4185 | sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE, | 4173 | sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE, |
4186 | SCTP_STATE(SCTP_STATE_CLOSED)); | 4174 | SCTP_STATE(SCTP_STATE_CLOSED)); |