1 files changed, 11 insertions, 3 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 78d2ddb5ca18..db73ef97485a 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -143,7 +143,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
         /* Initialize the maximum mumber of new data packets that can be sent
          * in a burst.
          */
-        asoc->max_burst = sctp_max_burst;
+        asoc->max_burst = sp->max_burst;
 
         /* initialize association timers */
         asoc->timeouts[SCTP_EVENT_TIMEOUT_NONE] = 0;
@@ -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:
@@ -725,7 +733,7 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
 
         default:
                 return;
-        };
+        }
 
         /* Generate and send a SCTP_PEER_ADDR_CHANGE notification to the
          * user.