sctp: do asoc update earlier in sctp_sf_do_dupcook_b

[sfrench/cifs-2.6.git] / net / sctp / sm_sideeffect.c

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 0948f14ce221a3c983b42f5036b7fbf6d7d4fc9c..ce15d590a615a3dd93d019011c93bd64bd413e34 100644 (file)
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -826,28 +826,6 @@ static void sctp_cmd_setup_t2(struct sctp_cmd_seq *cmds,
        asoc->timeouts[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN] = t->rto;
 }
 
-static void sctp_cmd_assoc_update(struct sctp_cmd_seq *cmds,
-                                 struct sctp_association *asoc,
-                                 struct sctp_association *new)
-{
-       struct net *net = asoc->base.net;
-       struct sctp_chunk *abort;
-
-       if (!sctp_assoc_update(asoc, new))
-               return;
-
-       abort = sctp_make_abort(asoc, NULL, sizeof(struct sctp_errhdr));
-       if (abort) {
-               sctp_init_cause(abort, SCTP_ERROR_RSRC_LOW, 0);
-               sctp_add_cmd_sf(cmds, SCTP_CMD_REPLY, SCTP_CHUNK(abort));
-       }
-       sctp_add_cmd_sf(cmds, SCTP_CMD_SET_SK_ERR, SCTP_ERROR(ECONNABORTED));
-       sctp_add_cmd_sf(cmds, SCTP_CMD_ASSOC_FAILED,
-                       SCTP_PERR(SCTP_ERROR_RSRC_LOW));
-       SCTP_INC_STATS(net, SCTP_MIB_ABORTEDS);
-       SCTP_DEC_STATS(net, SCTP_MIB_CURRESTAB);
-}
-
 /* Helper function to change the state of an association. */
 static void sctp_cmd_new_state(struct sctp_cmd_seq *cmds,
                               struct sctp_association *asoc,
@@ -1301,10 +1279,6 @@ static int sctp_cmd_interpreter(enum sctp_event_type event_type,
                        sctp_endpoint_add_asoc(ep, asoc);
                        break;
 
-               case SCTP_CMD_UPDATE_ASSOC:
-                      sctp_cmd_assoc_update(commands, asoc, cmd->obj.asoc);
-                      break;
-
                case SCTP_CMD_PURGE_OUTQUEUE:
                       sctp_outq_teardown(&asoc->outqueue);
                       break;