1 files changed, 17 insertions, 21 deletions

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 07194c2a32df..0c9d5a6950fe 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1124,7 +1124,7 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
                                 printk(KERN_WARNING
                                     "%s association %p could not find address "
                                     NIP6_FMT "\n",
-                                    __FUNCTION__,
+                                    __func__,
                                     asoc,
                                     NIP6(from_addr.v6.sin6_addr));
                 } else {
@@ -1132,7 +1132,7 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
                                 printk(KERN_WARNING
                                     "%s association %p could not find address "
                                     NIPQUAD_FMT "\n",
-                                    __FUNCTION__,
+                                    __func__,
                                     asoc,
                                     NIPQUAD(from_addr.v4.sin_addr.s_addr));
                 }
@@ -1150,7 +1150,7 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
             time_after(jiffies, hbinfo->sent_at + max_interval)) {
                 SCTP_DEBUG_PRINTK("%s: HEARTBEAT ACK with invalid timestamp "
                                   "received for transport: %p\n",
-                                   __FUNCTION__, link);
+                                   __func__, link);
                 return SCTP_DISPOSITION_DISCARD;
         }
 
@@ -1226,7 +1226,6 @@ static int sctp_sf_check_restart_addrs(const struct sctp_association *new_asoc,
                                        sctp_cmd_seq_t *commands)
 {
         struct sctp_transport *new_addr, *addr;
-        struct list_head *pos, *pos2;
         int found;
 
         /* Implementor's Guide - Sectin 5.2.2
@@ -1243,12 +1242,11 @@ static int sctp_sf_check_restart_addrs(const struct sctp_association *new_asoc,
         new_addr = NULL;
         found = 0;
 
-        list_for_each(pos, &new_asoc->peer.transport_addr_list) {
-                new_addr = list_entry(pos, struct sctp_transport, transports);
+        list_for_each_entry(new_addr, &new_asoc->peer.transport_addr_list,
+                        transports) {
                 found = 0;
-                list_for_each(pos2, &asoc->peer.transport_addr_list) {
-                        addr = list_entry(pos2, struct sctp_transport,
-                                          transports);
+                list_for_each_entry(addr, &asoc->peer.transport_addr_list,
+                                transports) {
                         if (sctp_cmp_addr_exact(&new_addr->ipaddr,
                                                 &addr->ipaddr)) {
                                 found = 1;
@@ -3135,12 +3133,8 @@ sctp_disposition_t sctp_sf_operr_notify(const struct sctp_endpoint *ep,
                 if (!ev)
                         goto nomem;
 
-                if (!sctp_add_cmd(commands, SCTP_CMD_EVENT_ULP,
-                                  SCTP_ULPEVENT(ev))) {
-                        sctp_ulpevent_free(ev);
-                        goto nomem;
-                }
-
+                sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP,
+                                SCTP_ULPEVENT(ev));
                 sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_OPERR,
                                 SCTP_CHUNK(chunk));
         }
@@ -3668,7 +3662,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(const struct sctp_endpoint *ep,
         skb_pull(chunk->skb, len);
 
         tsn = ntohl(fwdtsn_hdr->new_cum_tsn);
-        SCTP_DEBUG_PRINTK("%s: TSN 0x%x.\n", __FUNCTION__, tsn);
+        SCTP_DEBUG_PRINTK("%s: TSN 0x%x.\n", __func__, tsn);
 
         /* The TSN is too high--silently discard the chunk and count on it
          * getting retransmitted later.
@@ -3728,7 +3722,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast(
         skb_pull(chunk->skb, len);
 
         tsn = ntohl(fwdtsn_hdr->new_cum_tsn);
-        SCTP_DEBUG_PRINTK("%s: TSN 0x%x.\n", __FUNCTION__, tsn);
+        SCTP_DEBUG_PRINTK("%s: TSN 0x%x.\n", __func__, tsn);
 
         /* The TSN is too high--silently discard the chunk and count on it
          * getting retransmitted later.
@@ -4237,7 +4231,7 @@ static sctp_disposition_t sctp_sf_violation_chunklen(
                                      void *arg,
                                      sctp_cmd_seq_t *commands)
 {
-        char err_str[]="The following chunk had invalid length:";
+        static const char err_str[]="The following chunk had invalid length:";
 
         return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
                                         sizeof(err_str));
@@ -4254,7 +4248,7 @@ static sctp_disposition_t sctp_sf_violation_paramlen(
                                      const sctp_subtype_t type,
                                      void *arg,
                                      sctp_cmd_seq_t *commands) {
-        char err_str[] = "The following parameter had invalid length:";
+        static const char err_str[] = "The following parameter had invalid length:";
 
         return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
                                         sizeof(err_str));
@@ -4273,7 +4267,7 @@ static sctp_disposition_t sctp_sf_violation_ctsn(
                                      void *arg,
                                      sctp_cmd_seq_t *commands)
 {
-        char err_str[]="The cumulative tsn ack beyond the max tsn currently sent:";
+        static const char err_str[]="The cumulative tsn ack beyond the max tsn currently sent:";
 
         return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
                                         sizeof(err_str));
@@ -4292,7 +4286,7 @@ static sctp_disposition_t sctp_sf_violation_chunk(
                                      void *arg,
                                      sctp_cmd_seq_t *commands)
 {
-        char err_str[]="The following chunk violates protocol:";
+        static const char err_str[]="The following chunk violates protocol:";
 
         if (!asoc)
                 return sctp_sf_violation(ep, asoc, type, arg, commands);
@@ -5331,6 +5325,8 @@ sctp_disposition_t sctp_sf_t2_timer_expire(const struct sctp_endpoint *ep,
         SCTP_DEBUG_PRINTK("Timer T2 expired.\n");
         SCTP_INC_STATS(SCTP_MIB_T2_SHUTDOWN_EXPIREDS);
 
+        ((struct sctp_association *)asoc)->shutdown_retries++;
+
         if (asoc->overall_error_count >= asoc->max_retrans) {
                 sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR,
                                 SCTP_ERROR(ETIMEDOUT));