2 files changed, 10 insertions, 1 deletions

diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 9a8352710631..4ed752119bbc 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -265,6 +265,7 @@ enum sctp_spc_state {
         SCTP_ADDR_REMOVED,
         SCTP_ADDR_ADDED,
         SCTP_ADDR_MADE_PRIM,
+        SCTP_ADDR_CONFIRMED,
 };
 
 
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 78d2ddb5ca18..85af1cb70fe8 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -714,8 +714,16 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
         /* Record the transition on the transport.  */
         switch (command) {
         case SCTP_TRANSPORT_UP:
+                /* If we are moving from UNCONFIRMED state due
+                 * to heartbeat success, report the SCTP_ADDR_CONFIRMED
+                 * state to the user, otherwise report SCTP_ADDR_AVAILABLE.
+                 */
+                if (SCTP_UNCONFIRMED == transport->state &&
+                    SCTP_HEARTBEAT_SUCCESS == error)
+                        spc_state = SCTP_ADDR_CONFIRMED;
+                else
+                        spc_state = SCTP_ADDR_AVAILABLE;
                 transport->state = SCTP_ACTIVE;
-                spc_state = SCTP_ADDR_AVAILABLE;
                 break;
 
         case SCTP_TRANSPORT_DOWN: