Merge branch 'acpica-validate-address-regression' into next

[cascardo/linux.git] / net / sctp / sm_statefuns.c

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index a0f31e6..891f5db 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -3618,6 +3618,11 @@ sctp_disposition_t sctp_sf_do_asconf(const struct sctp_endpoint *ep,
         */
        asconf_ack->dest = chunk->source;
        sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack));
+       if (asoc->new_transport) {
+               sctp_sf_heartbeat(ep, asoc, type, asoc->new_transport,
+                    commands);
+               ((struct sctp_association *)asoc)->new_transport = NULL;
+       }
 
        return SCTP_DISPOSITION_CONSUME;
 }