Author: tuexen
Date: Thu Dec 29 11:32:42 2016
New Revision: 310773
URL: https://svnweb.freebsd.org/changeset/base/310773

Log:
  MFC r310590:
  
  Whitespace changes.
  
  The toolchain for processing the sources has been updated. No functional
  change.

Modified:
  stable/11/sys/netinet/sctp_asconf.c
  stable/11/sys/netinet/sctp_auth.c
  stable/11/sys/netinet/sctp_auth.h
  stable/11/sys/netinet/sctp_bsd_addr.c
  stable/11/sys/netinet/sctp_bsd_addr.h
  stable/11/sys/netinet/sctp_cc_functions.c
  stable/11/sys/netinet/sctp_crc32.c
  stable/11/sys/netinet/sctp_indata.c
  stable/11/sys/netinet/sctp_indata.h
  stable/11/sys/netinet/sctp_input.c
  stable/11/sys/netinet/sctp_input.h
  stable/11/sys/netinet/sctp_output.c
  stable/11/sys/netinet/sctp_output.h
  stable/11/sys/netinet/sctp_pcb.c
  stable/11/sys/netinet/sctp_pcb.h
  stable/11/sys/netinet/sctp_ss_functions.c
  stable/11/sys/netinet/sctp_structs.h
  stable/11/sys/netinet/sctp_sysctl.c
  stable/11/sys/netinet/sctp_timer.c
  stable/11/sys/netinet/sctp_usrreq.c
  stable/11/sys/netinet/sctputil.c
  stable/11/sys/netinet/sctputil.h
  stable/11/sys/netinet6/sctp6_usrreq.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/sctp_asconf.c
==============================================================================
--- stable/11/sys/netinet/sctp_asconf.c Thu Dec 29 11:25:41 2016        
(r310772)
+++ stable/11/sys/netinet/sctp_asconf.c Thu Dec 29 11:32:42 2016        
(r310773)
@@ -97,7 +97,7 @@ sctp_asconf_success_response(uint32_t id
 }
 
 static struct mbuf *
-sctp_asconf_error_response(uint32_t id, uint16_t cause, uint8_t * error_tlv,
+sctp_asconf_error_response(uint32_t id, uint16_t cause, uint8_t *error_tlv,
     uint16_t tlv_length)
 {
        struct mbuf *m_reply = NULL;
@@ -132,7 +132,7 @@ sctp_asconf_error_response(uint32_t id, 
                return (NULL);
        }
        if (error_tlv != NULL) {
-               tlv = (uint8_t *) (error + 1);
+               tlv = (uint8_t *)(error + 1);
                memcpy(tlv, error_tlv, tlv_length);
        }
        SCTP_BUF_LEN(m_reply) = aph->ph.param_length;
@@ -222,7 +222,7 @@ sctp_process_asconf_add_ip(struct sockad
 #endif
        default:
                m_reply = sctp_asconf_error_response(aph->correlation_id,
-                   SCTP_CAUSE_INVALID_PARAM, (uint8_t *) aph,
+                   SCTP_CAUSE_INVALID_PARAM, (uint8_t *)aph,
                    aparam_length);
                return (m_reply);
        }                       /* end switch */
@@ -237,7 +237,7 @@ sctp_process_asconf_add_ip(struct sockad
        /* add the address */
        if (bad_address) {
                m_reply = sctp_asconf_error_response(aph->correlation_id,
-                   SCTP_CAUSE_INVALID_PARAM, (uint8_t *) aph,
+                   SCTP_CAUSE_INVALID_PARAM, (uint8_t *)aph,
                    aparam_length);
        } else if (sctp_add_remote_addr(stcb, sa, &net, stcb->asoc.port,
                    SCTP_DONOT_SETSCOPE,
@@ -245,7 +245,7 @@ sctp_process_asconf_add_ip(struct sockad
                SCTPDBG(SCTP_DEBUG_ASCONF1,
                    "process_asconf_add_ip: error adding address\n");
                m_reply = sctp_asconf_error_response(aph->correlation_id,
-                   SCTP_CAUSE_RESOURCE_SHORTAGE, (uint8_t *) aph,
+                   SCTP_CAUSE_RESOURCE_SHORTAGE, (uint8_t *)aph,
                    aparam_length);
        } else {
                /* notify upper layer */
@@ -367,7 +367,7 @@ sctp_process_asconf_delete_ip(struct soc
 #endif
        default:
                m_reply = sctp_asconf_error_response(aph->correlation_id,
-                   SCTP_CAUSE_UNRESOLVABLE_ADDR, (uint8_t *) aph,
+                   SCTP_CAUSE_UNRESOLVABLE_ADDR, (uint8_t *)aph,
                    aparam_length);
                return (m_reply);
        }
@@ -377,7 +377,7 @@ sctp_process_asconf_delete_ip(struct soc
                /* trying to delete the source address! */
                SCTPDBG(SCTP_DEBUG_ASCONF1, "process_asconf_delete_ip: tried to 
delete source addr\n");
                m_reply = sctp_asconf_error_response(aph->correlation_id,
-                   SCTP_CAUSE_DELETING_SRC_ADDR, (uint8_t *) aph,
+                   SCTP_CAUSE_DELETING_SRC_ADDR, (uint8_t *)aph,
                    aparam_length);
                return (m_reply);
        }
@@ -391,7 +391,7 @@ sctp_process_asconf_delete_ip(struct soc
                        /* what error to reply with?? */
                        m_reply =
                            sctp_asconf_error_response(aph->correlation_id,
-                           SCTP_CAUSE_REQUEST_REFUSED, (uint8_t *) aph,
+                           SCTP_CAUSE_REQUEST_REFUSED, (uint8_t *)aph,
                            aparam_length);
                } else if (response_required) {
                        m_reply =
@@ -410,7 +410,7 @@ sctp_process_asconf_delete_ip(struct soc
                /* only one address in the asoc */
                SCTPDBG(SCTP_DEBUG_ASCONF1, "process_asconf_delete_ip: tried to 
delete last IP addr!\n");
                m_reply = sctp_asconf_error_response(aph->correlation_id,
-                   SCTP_CAUSE_DELETING_LAST_ADDR, (uint8_t *) aph,
+                   SCTP_CAUSE_DELETING_LAST_ADDR, (uint8_t *)aph,
                    aparam_length);
        } else {
                if (response_required) {
@@ -492,7 +492,7 @@ sctp_process_asconf_set_primary(struct s
 #endif
        default:
                m_reply = sctp_asconf_error_response(aph->correlation_id,
-                   SCTP_CAUSE_UNRESOLVABLE_ADDR, (uint8_t *) aph,
+                   SCTP_CAUSE_UNRESOLVABLE_ADDR, (uint8_t *)aph,
                    aparam_length);
                return (m_reply);
        }
@@ -563,7 +563,7 @@ sctp_process_asconf_set_primary(struct s
                    "process_asconf_set_primary: set primary failed!\n");
                /* must have been an invalid address, so report */
                m_reply = sctp_asconf_error_response(aph->correlation_id,
-                   SCTP_CAUSE_UNRESOLVABLE_ADDR, (uint8_t *) aph,
+                   SCTP_CAUSE_UNRESOLVABLE_ADDR, (uint8_t *)aph,
                    aparam_length);
        }
 
@@ -658,7 +658,7 @@ sctp_handle_asconf(struct mbuf *m, unsig
 
        /* skip the lookup address parameter */
        offset += sizeof(struct sctp_asconf_chunk);
-       p_addr = (struct sctp_ipv6addr_param *)sctp_m_getptr(m, offset, 
sizeof(struct sctp_paramhdr), (uint8_t *) & aparam_buf);
+       p_addr = (struct sctp_ipv6addr_param *)sctp_m_getptr(m, offset, 
sizeof(struct sctp_paramhdr), (uint8_t *)&aparam_buf);
        if (p_addr == NULL) {
                SCTPDBG(SCTP_DEBUG_ASCONF1,
                    "handle_asconf: couldn't get lookup addr!\n");
@@ -668,7 +668,7 @@ sctp_handle_asconf(struct mbuf *m, unsig
        /* param_length is already validated in process_control... */
        offset += ntohs(p_addr->ph.param_length);       /* skip lookup addr */
        /* get pointer to first asconf param in ASCONF */
-       aph = (struct sctp_asconf_paramhdr *)sctp_m_getptr(m, offset, 
sizeof(struct sctp_asconf_paramhdr), (uint8_t *) & aparam_buf);
+       aph = (struct sctp_asconf_paramhdr *)sctp_m_getptr(m, offset, 
sizeof(struct sctp_asconf_paramhdr), (uint8_t *)&aparam_buf);
        if (aph == NULL) {
                SCTPDBG(SCTP_DEBUG_ASCONF1, "Empty ASCONF received?\n");
                goto send_reply;
@@ -765,7 +765,7 @@ sctp_handle_asconf(struct mbuf *m, unsig
                /* get pointer to next asconf param */
                aph = (struct sctp_asconf_paramhdr *)sctp_m_getptr(m, offset,
                    sizeof(struct sctp_asconf_paramhdr),
-                   (uint8_t *) & aparam_buf);
+                   (uint8_t *)&aparam_buf);
                if (aph == NULL) {
                        /* can't get an asconf paramhdr */
                        SCTPDBG(SCTP_DEBUG_ASCONF1, "handle_asconf: can't get 
asconf param hdr!\n");
@@ -1094,7 +1094,7 @@ sctp_path_check_and_react(struct sctp_tc
                 * NOT corresponding to the current nexthop, the path will
                 * not be changed.
                 */
-               SCTP_RTALLOC((sctp_route_t *) & net->ro,
+               SCTP_RTALLOC((sctp_route_t *)&net->ro,
                    stcb->sctp_ep->def_vrf_id,
                    stcb->sctp_ep->fibnum);
                if (net->ro.ro_rt == NULL)
@@ -1104,7 +1104,7 @@ sctp_path_check_and_react(struct sctp_tc
                switch (net->ro._l_addr.sa.sa_family) {
 #ifdef INET
                case AF_INET:
-                       if (sctp_v4src_match_nexthop(newifa, (sctp_route_t *) & 
net->ro)) {
+                       if (sctp_v4src_match_nexthop(newifa, (sctp_route_t 
*)&net->ro)) {
                                changed = 1;
                        }
                        break;
@@ -1112,7 +1112,7 @@ sctp_path_check_and_react(struct sctp_tc
 #ifdef INET6
                case AF_INET6:
                        if (sctp_v6src_match_nexthop(
-                           &newifa->address.sin6, (sctp_route_t *) & net->ro)) 
{
+                           &newifa->address.sin6, (sctp_route_t *)&net->ro)) {
                                changed = 1;
                        }
                        break;
@@ -2419,8 +2419,10 @@ sctp_is_addr_pending(struct sctp_tcb *st
                }
        }
 
-       /* we want to find the sequences which consist of ADD -> DEL -> ADD
-        * or DEL -> ADD */
+       /*
+        * we want to find the sequences which consist of ADD -> DEL -> ADD
+        * or DEL -> ADD
+        */
        if (add_cnt > del_cnt ||
            (add_cnt == del_cnt && last_param_type == SCTP_ADD_IP_ADDRESS)) {
                return (1);
@@ -2472,8 +2474,10 @@ sctp_find_valid_localaddr(struct sctp_tc
                                        if (sctp_is_addr_restricted(stcb, 
sctp_ifa) &&
                                            (!sctp_is_addr_pending(stcb, 
sctp_ifa)))
                                                continue;
-                                       /* found a valid local v4 address to
-                                        * use */
+                                       /*
+                                        * found a valid local v4 address to
+                                        * use
+                                        */
                                        if (addr_locked == SCTP_ADDR_NOT_LOCKED)
                                                SCTP_IPI_ADDR_RUNLOCK();
                                        return (&sctp_ifa->address.sa);
@@ -2490,8 +2494,10 @@ sctp_find_valid_localaddr(struct sctp_tc
                                        }
                                        sin6 = &sctp_ifa->address.sin6;
                                        if 
(IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-                                               /* we skip unspecifed
-                                                * addresses */
+                                               /*
+                                                * we skip unspecifed
+                                                * addresses
+                                                */
                                                continue;
                                        }
                                        if 
(prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred,
@@ -2508,8 +2514,10 @@ sctp_find_valid_localaddr(struct sctp_tc
                                        if (sctp_is_addr_restricted(stcb, 
sctp_ifa) &&
                                            (!sctp_is_addr_pending(stcb, 
sctp_ifa)))
                                                continue;
-                                       /* found a valid local v6 address to
-                                        * use */
+                                       /*
+                                        * found a valid local v6 address to
+                                        * use
+                                        */
                                        if (addr_locked == SCTP_ADDR_NOT_LOCKED)
                                                SCTP_IPI_ADDR_RUNLOCK();
                                        return (&sctp_ifa->address.sa);
@@ -2777,7 +2785,7 @@ sctp_process_initack_addresses(struct sc
        /* go through the addresses in the init-ack */
        ph = (struct sctp_paramhdr *)
            sctp_m_getptr(m, offset, sizeof(struct sctp_paramhdr),
-           (uint8_t *) & tmp_param);
+           (uint8_t *)&tmp_param);
        while (ph != NULL) {
                ptype = ntohs(ph->param_type);
                plen = ntohs(ph->param_length);
@@ -2791,7 +2799,7 @@ sctp_process_initack_addresses(struct sc
                                a6p = (struct sctp_ipv6addr_param *)
                                    sctp_m_getptr(m, offset,
                                    sizeof(struct sctp_ipv6addr_param),
-                                   (uint8_t *) & addr6_store);
+                                   (uint8_t *)&addr6_store);
                                if (plen != sizeof(struct sctp_ipv6addr_param) 
||
                                    a6p == NULL) {
                                        return;
@@ -2812,7 +2820,7 @@ sctp_process_initack_addresses(struct sc
                                /* get the entire IPv4 address param */
                                a4p = (struct sctp_ipv4addr_param 
*)sctp_m_getptr(m, offset,
                                    sizeof(struct sctp_ipv4addr_param),
-                                   (uint8_t *) & addr4_store);
+                                   (uint8_t *)&addr4_store);
                                if (plen != sizeof(struct sctp_ipv4addr_param) 
||
                                    a4p == NULL) {
                                        return;
@@ -2874,7 +2882,7 @@ next_addr:
                if ((offset + sizeof(struct sctp_paramhdr)) > length)
                        return;
                ph = (struct sctp_paramhdr *)sctp_m_getptr(m, offset,
-                   sizeof(struct sctp_paramhdr), (uint8_t *) & tmp_param);
+                   sizeof(struct sctp_paramhdr), (uint8_t *)&tmp_param);
        }                       /* while */
 }
 
@@ -2925,7 +2933,7 @@ sctp_addr_in_initack(struct mbuf *m, uin
        }
        /* go through the addresses in the init-ack */
        ph = (struct sctp_paramhdr *)sctp_m_getptr(m, offset,
-           sizeof(struct sctp_paramhdr), (uint8_t *) & tmp_param);
+           sizeof(struct sctp_paramhdr), (uint8_t *)&tmp_param);
        while (ph != NULL) {
                ptype = ntohs(ph->param_type);
                plen = ntohs(ph->param_length);
@@ -2941,7 +2949,7 @@ sctp_addr_in_initack(struct mbuf *m, uin
                                a6p = (struct sctp_ipv6addr_param *)
                                    sctp_m_getptr(m, offset,
                                    sizeof(struct sctp_ipv6addr_param),
-                                   (uint8_t *) & addr6_store);
+                                   (uint8_t *)&addr6_store);
                                if (a6p == NULL) {
                                        return (0);
                                }
@@ -2971,7 +2979,7 @@ sctp_addr_in_initack(struct mbuf *m, uin
                                a4p = (struct sctp_ipv4addr_param *)
                                    sctp_m_getptr(m, offset,
                                    sizeof(struct sctp_ipv4addr_param),
-                                   (uint8_t *) & addr4_store);
+                                   (uint8_t *)&addr4_store);
                                if (a4p == NULL) {
                                        return (0);
                                }
@@ -2993,7 +3001,7 @@ sctp_addr_in_initack(struct mbuf *m, uin
                }
                ph = (struct sctp_paramhdr *)
                    sctp_m_getptr(m, offset, sizeof(struct sctp_paramhdr),
-                   (uint8_t *) & tmp_param);
+                   (uint8_t *)&tmp_param);
        }                       /* while */
        /* not found! */
        return (0);

Modified: stable/11/sys/netinet/sctp_auth.c
==============================================================================
--- stable/11/sys/netinet/sctp_auth.c   Thu Dec 29 11:25:41 2016        
(r310772)
+++ stable/11/sys/netinet/sctp_auth.c   Thu Dec 29 11:32:42 2016        
(r310773)
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 
 
 void
-sctp_clear_chunklist(sctp_auth_chklist_t * chklist)
+sctp_clear_chunklist(sctp_auth_chklist_t *chklist)
 {
        bzero(chklist, sizeof(*chklist));
        /* chklist->num_chunks = 0; */
@@ -73,14 +73,14 @@ sctp_alloc_chunklist(void)
 }
 
 void
-sctp_free_chunklist(sctp_auth_chklist_t * list)
+sctp_free_chunklist(sctp_auth_chklist_t *list)
 {
        if (list != NULL)
                SCTP_FREE(list, SCTP_M_AUTH_CL);
 }
 
 sctp_auth_chklist_t *
-sctp_copy_chunklist(sctp_auth_chklist_t * list)
+sctp_copy_chunklist(sctp_auth_chklist_t *list)
 {
        sctp_auth_chklist_t *new_list;
 
@@ -102,7 +102,7 @@ sctp_copy_chunklist(sctp_auth_chklist_t 
  * add a chunk to the required chunks list
  */
 int
-sctp_auth_add_chunk(uint8_t chunk, sctp_auth_chklist_t * list)
+sctp_auth_add_chunk(uint8_t chunk, sctp_auth_chklist_t *list)
 {
        if (list == NULL)
                return (-1);
@@ -128,7 +128,7 @@ sctp_auth_add_chunk(uint8_t chunk, sctp_
  * delete a chunk from the required chunks list
  */
 int
-sctp_auth_delete_chunk(uint8_t chunk, sctp_auth_chklist_t * list)
+sctp_auth_delete_chunk(uint8_t chunk, sctp_auth_chklist_t *list)
 {
        if (list == NULL)
                return (-1);
@@ -144,7 +144,7 @@ sctp_auth_delete_chunk(uint8_t chunk, sc
 }
 
 size_t
-sctp_auth_get_chklist_size(const sctp_auth_chklist_t * list)
+sctp_auth_get_chklist_size(const sctp_auth_chklist_t *list)
 {
        if (list == NULL)
                return (0);
@@ -157,7 +157,7 @@ sctp_auth_get_chklist_size(const sctp_au
  * guarantee ptr has space for up to 256 bytes
  */
 int
-sctp_serialize_auth_chunks(const sctp_auth_chklist_t * list, uint8_t * ptr)
+sctp_serialize_auth_chunks(const sctp_auth_chklist_t *list, uint8_t *ptr)
 {
        int i, count = 0;
 
@@ -174,7 +174,7 @@ sctp_serialize_auth_chunks(const sctp_au
 }
 
 int
-sctp_pack_auth_chunks(const sctp_auth_chklist_t * list, uint8_t * ptr)
+sctp_pack_auth_chunks(const sctp_auth_chklist_t *list, uint8_t *ptr)
 {
        int i, size = 0;
 
@@ -206,8 +206,8 @@ sctp_pack_auth_chunks(const sctp_auth_ch
 }
 
 int
-sctp_unpack_auth_chunks(const uint8_t * ptr, uint8_t num_chunks,
-    sctp_auth_chklist_t * list)
+sctp_unpack_auth_chunks(const uint8_t *ptr, uint8_t num_chunks,
+    sctp_auth_chklist_t *list)
 {
        int i;
        int size;
@@ -257,14 +257,14 @@ sctp_alloc_key(uint32_t keylen)
 }
 
 void
-sctp_free_key(sctp_key_t * key)
+sctp_free_key(sctp_key_t *key)
 {
        if (key != NULL)
                SCTP_FREE(key, SCTP_M_AUTH_KY);
 }
 
 void
-sctp_print_key(sctp_key_t * key, const char *str)
+sctp_print_key(sctp_key_t *key, const char *str)
 {
        uint32_t i;
 
@@ -283,7 +283,7 @@ sctp_print_key(sctp_key_t * key, const c
 }
 
 void
-sctp_show_key(sctp_key_t * key, const char *str)
+sctp_show_key(sctp_key_t *key, const char *str)
 {
        uint32_t i;
 
@@ -302,7 +302,7 @@ sctp_show_key(sctp_key_t * key, const ch
 }
 
 static uint32_t
-sctp_get_keylen(sctp_key_t * key)
+sctp_get_keylen(sctp_key_t *key)
 {
        if (key != NULL)
                return (key->keylen);
@@ -329,7 +329,7 @@ sctp_generate_random_key(uint32_t keylen
 }
 
 sctp_key_t *
-sctp_set_key(uint8_t * key, uint32_t keylen)
+sctp_set_key(uint8_t *key, uint32_t keylen)
 {
        sctp_key_t *new_key;
 
@@ -349,7 +349,7 @@ sctp_set_key(uint8_t * key, uint32_t key
  *           0 if key1 = key2
  */
 static int
-sctp_compare_key(sctp_key_t * key1, sctp_key_t * key2)
+sctp_compare_key(sctp_key_t *key1, sctp_key_t *key2)
 {
        uint32_t maxlen;
        uint32_t i;
@@ -400,7 +400,7 @@ sctp_compare_key(sctp_key_t * key1, sctp
  * order for concatenation
  */
 sctp_key_t *
-sctp_compute_hashkey(sctp_key_t * key1, sctp_key_t * key2, sctp_key_t * shared)
+sctp_compute_hashkey(sctp_key_t *key1, sctp_key_t *key2, sctp_key_t *shared)
 {
        uint32_t keylen;
        sctp_key_t *new_key;
@@ -474,7 +474,7 @@ sctp_alloc_sharedkey(void)
 }
 
 void
-sctp_free_sharedkey(sctp_sharedkey_t * skey)
+sctp_free_sharedkey(sctp_sharedkey_t *skey)
 {
        if (skey == NULL)
                return;
@@ -500,7 +500,7 @@ sctp_find_sharedkey(struct sctp_keyhead 
 
 int
 sctp_insert_sharedkey(struct sctp_keyhead *shared_keys,
-    sctp_sharedkey_t * new_skey)
+    sctp_sharedkey_t *new_skey)
 {
        sctp_sharedkey_t *skey;
 
@@ -594,7 +594,7 @@ sctp_auth_key_release(struct sctp_tcb *s
 }
 
 static sctp_sharedkey_t *
-sctp_copy_sharedkey(const sctp_sharedkey_t * skey)
+sctp_copy_sharedkey(const sctp_sharedkey_t *skey)
 {
        sctp_sharedkey_t *new_skey;
 
@@ -652,7 +652,7 @@ sctp_alloc_hmaclist(uint16_t num_hmacs)
 }
 
 void
-sctp_free_hmaclist(sctp_hmaclist_t * list)
+sctp_free_hmaclist(sctp_hmaclist_t *list)
 {
        if (list != NULL) {
                SCTP_FREE(list, SCTP_M_AUTH_HL);
@@ -661,7 +661,7 @@ sctp_free_hmaclist(sctp_hmaclist_t * lis
 }
 
 int
-sctp_auth_add_hmacid(sctp_hmaclist_t * list, uint16_t hmac_id)
+sctp_auth_add_hmacid(sctp_hmaclist_t *list, uint16_t hmac_id)
 {
        int i;
 
@@ -689,7 +689,7 @@ sctp_auth_add_hmacid(sctp_hmaclist_t * l
 }
 
 sctp_hmaclist_t *
-sctp_copy_hmaclist(sctp_hmaclist_t * list)
+sctp_copy_hmaclist(sctp_hmaclist_t *list)
 {
        sctp_hmaclist_t *new_list;
        int i;
@@ -727,7 +727,7 @@ sctp_default_supported_hmaclist(void)
  * find the best HMAC id to use for the peer based on local support
  */
 uint16_t
-sctp_negotiate_hmacid(sctp_hmaclist_t * peer, sctp_hmaclist_t * local)
+sctp_negotiate_hmacid(sctp_hmaclist_t *peer, sctp_hmaclist_t *local)
 {
        int i, j;
 
@@ -754,7 +754,7 @@ sctp_negotiate_hmacid(sctp_hmaclist_t * 
  * caller must guarantee ptr has appropriate space
  */
 int
-sctp_serialize_hmaclist(sctp_hmaclist_t * list, uint8_t * ptr)
+sctp_serialize_hmaclist(sctp_hmaclist_t *list, uint8_t *ptr)
 {
        int i;
        uint16_t hmac_id;
@@ -800,7 +800,7 @@ sctp_alloc_authinfo(void)
 }
 
 void
-sctp_free_authinfo(sctp_authinfo_t * authinfo)
+sctp_free_authinfo(sctp_authinfo_t *authinfo)
 {
        if (authinfo == NULL)
                return;
@@ -858,7 +858,7 @@ sctp_get_hmac_block_len(uint16_t hmac_al
 }
 
 static void
-sctp_hmac_init(uint16_t hmac_algo, sctp_hash_context_t * ctx)
+sctp_hmac_init(uint16_t hmac_algo, sctp_hash_context_t *ctx)
 {
        switch (hmac_algo) {
        case SCTP_AUTH_HMAC_ID_SHA1:
@@ -875,8 +875,8 @@ sctp_hmac_init(uint16_t hmac_algo, sctp_
 }
 
 static void
-sctp_hmac_update(uint16_t hmac_algo, sctp_hash_context_t * ctx,
-    uint8_t * text, uint32_t textlen)
+sctp_hmac_update(uint16_t hmac_algo, sctp_hash_context_t *ctx,
+    uint8_t *text, uint32_t textlen)
 {
        switch (hmac_algo) {
        case SCTP_AUTH_HMAC_ID_SHA1:
@@ -893,8 +893,8 @@ sctp_hmac_update(uint16_t hmac_algo, sct
 }
 
 static void
-sctp_hmac_final(uint16_t hmac_algo, sctp_hash_context_t * ctx,
-    uint8_t * digest)
+sctp_hmac_final(uint16_t hmac_algo, sctp_hash_context_t *ctx,
+    uint8_t *digest)
 {
        switch (hmac_algo) {
        case SCTP_AUTH_HMAC_ID_SHA1:
@@ -921,8 +921,8 @@ sctp_hmac_final(uint16_t hmac_algo, sctp
  * resultant digest.
  */
 uint32_t
-sctp_hmac(uint16_t hmac_algo, uint8_t * key, uint32_t keylen,
-    uint8_t * text, uint32_t textlen, uint8_t * digest)
+sctp_hmac(uint16_t hmac_algo, uint8_t *key, uint32_t keylen,
+    uint8_t *text, uint32_t textlen, uint8_t *digest)
 {
        uint32_t digestlen;
        uint32_t blocklen;
@@ -981,8 +981,8 @@ sctp_hmac(uint16_t hmac_algo, uint8_t * 
 
 /* mbuf version */
 uint32_t
-sctp_hmac_m(uint16_t hmac_algo, uint8_t * key, uint32_t keylen,
-    struct mbuf *m, uint32_t m_offset, uint8_t * digest, uint32_t trailer)
+sctp_hmac_m(uint16_t hmac_algo, uint8_t *key, uint32_t keylen,
+    struct mbuf *m, uint32_t m_offset, uint8_t *digest, uint32_t trailer)
 {
        uint32_t digestlen;
        uint32_t blocklen;
@@ -1029,17 +1029,17 @@ sctp_hmac_m(uint16_t hmac_algo, uint8_t 
        sctp_hmac_update(hmac_algo, &ctx, ipad, blocklen);
        /* find the correct starting mbuf and offset (get start of text) */
        m_tmp = m;
-       while ((m_tmp != NULL) && (m_offset >= (uint32_t) SCTP_BUF_LEN(m_tmp))) 
{
+       while ((m_tmp != NULL) && (m_offset >= (uint32_t)SCTP_BUF_LEN(m_tmp))) {
                m_offset -= SCTP_BUF_LEN(m_tmp);
                m_tmp = SCTP_BUF_NEXT(m_tmp);
        }
        /* now use the rest of the mbuf chain for the text */
        while (m_tmp != NULL) {
                if ((SCTP_BUF_NEXT(m_tmp) == NULL) && trailer) {
-                       sctp_hmac_update(hmac_algo, &ctx, mtod(m_tmp, uint8_t 
*) + m_offset,
+                       sctp_hmac_update(hmac_algo, &ctx, mtod(m_tmp, uint8_t 
*)+m_offset,
                            SCTP_BUF_LEN(m_tmp) - (trailer + m_offset));
                } else {
-                       sctp_hmac_update(hmac_algo, &ctx, mtod(m_tmp, uint8_t 
*) + m_offset,
+                       sctp_hmac_update(hmac_algo, &ctx, mtod(m_tmp, uint8_t 
*)+m_offset,
                            SCTP_BUF_LEN(m_tmp) - m_offset);
                }
 
@@ -1064,9 +1064,9 @@ sctp_hmac_m(uint16_t hmac_algo, uint8_t 
  * Returns -1 on error, 0 on success.
  */
 int
-sctp_verify_hmac(uint16_t hmac_algo, uint8_t * key, uint32_t keylen,
-    uint8_t * text, uint32_t textlen,
-    uint8_t * digest, uint32_t digestlen)
+sctp_verify_hmac(uint16_t hmac_algo, uint8_t *key, uint32_t keylen,
+    uint8_t *text, uint32_t textlen,
+    uint8_t *digest, uint32_t digestlen)
 {
        uint32_t len;
        uint8_t temp[SCTP_AUTH_DIGEST_LEN_MAX];
@@ -1097,8 +1097,8 @@ sctp_verify_hmac(uint16_t hmac_algo, uin
  * the keylen exceeds the HMAC block len).
  */
 uint32_t
-sctp_compute_hmac(uint16_t hmac_algo, sctp_key_t * key, uint8_t * text,
-    uint32_t textlen, uint8_t * digest)
+sctp_compute_hmac(uint16_t hmac_algo, sctp_key_t *key, uint8_t *text,
+    uint32_t textlen, uint8_t *digest)
 {
        uint32_t digestlen;
        uint32_t blocklen;
@@ -1132,8 +1132,8 @@ sctp_compute_hmac(uint16_t hmac_algo, sc
 
 /* mbuf version */
 uint32_t
-sctp_compute_hmac_m(uint16_t hmac_algo, sctp_key_t * key, struct mbuf *m,
-    uint32_t m_offset, uint8_t * digest)
+sctp_compute_hmac_m(uint16_t hmac_algo, sctp_key_t *key, struct mbuf *m,
+    uint32_t m_offset, uint8_t *digest)
 {
        uint32_t digestlen;
        uint32_t blocklen;
@@ -1164,7 +1164,7 @@ sctp_compute_hmac_m(uint16_t hmac_algo, 
 }
 
 int
-sctp_auth_is_supported_hmac(sctp_hmaclist_t * list, uint16_t id)
+sctp_auth_is_supported_hmac(sctp_hmaclist_t *list, uint16_t id)
 {
        int i;
 
@@ -1422,7 +1422,7 @@ sctp_auth_get_cookie_params(struct sctp_
        length += offset;
 
        phdr = (struct sctp_paramhdr *)sctp_m_getptr(m, offset,
-           sizeof(struct sctp_paramhdr), (uint8_t *) & tmp_param);
+           sizeof(struct sctp_paramhdr), (uint8_t *)&tmp_param);
        while (phdr != NULL) {
                ptype = ntohs(phdr->param_type);
                plen = ntohs(phdr->param_length);
@@ -1489,7 +1489,7 @@ sctp_auth_get_cookie_params(struct sctp_
                if (offset + sizeof(struct sctp_paramhdr) > length)
                        break;
                phdr = (struct sctp_paramhdr *)sctp_m_getptr(m, offset, 
sizeof(struct sctp_paramhdr),
-                   (uint8_t *) & tmp_param);
+                   (uint8_t *)&tmp_param);
        }
        /* concatenate the full random key */
        keylen = sizeof(*p_random) + random_len + sizeof(*hmacs) + hmacs_len;
@@ -1599,14 +1599,14 @@ sctp_bzero_m(struct mbuf *m, uint32_t m_
 
        /* find the correct starting mbuf and offset (get start position) */
        m_tmp = m;
-       while ((m_tmp != NULL) && (m_offset >= (uint32_t) SCTP_BUF_LEN(m_tmp))) 
{
+       while ((m_tmp != NULL) && (m_offset >= (uint32_t)SCTP_BUF_LEN(m_tmp))) {
                m_offset -= SCTP_BUF_LEN(m_tmp);
                m_tmp = SCTP_BUF_NEXT(m_tmp);
        }
        /* now use the rest of the mbuf chain */
        while ((m_tmp != NULL) && (size > 0)) {
-               data = mtod(m_tmp, uint8_t *) + m_offset;
-               if (size > (uint32_t) SCTP_BUF_LEN(m_tmp)) {
+               data = mtod(m_tmp, uint8_t *)+m_offset;
+               if (size > (uint32_t)SCTP_BUF_LEN(m_tmp)) {
                        bzero(data, SCTP_BUF_LEN(m_tmp));
                        size -= SCTP_BUF_LEN(m_tmp);
                } else {

Modified: stable/11/sys/netinet/sctp_auth.h
==============================================================================
--- stable/11/sys/netinet/sctp_auth.h   Thu Dec 29 11:25:41 2016        
(r310772)
+++ stable/11/sys/netinet/sctp_auth.h   Thu Dec 29 11:32:42 2016        
(r310773)
@@ -51,12 +51,12 @@ __FBSDID("$FreeBSD$");
 typedef union sctp_hash_context {
        SCTP_SHA1_CTX sha1;
        SCTP_SHA256_CTX sha256;
-}                 sctp_hash_context_t;
+} sctp_hash_context_t;
 
 typedef struct sctp_key {
        uint32_t keylen;
        uint8_t key[];
-}        sctp_key_t;
+} sctp_key_t;
 
 typedef struct sctp_shared_key {
        LIST_ENTRY(sctp_shared_key) next;
@@ -64,7 +64,7 @@ typedef struct sctp_shared_key {
        uint32_t refcount;      /* reference count */
        uint16_t keyid;         /* shared key ID */
        uint8_t deactivated;    /* key is deactivated */
-}               sctp_sharedkey_t;
+} sctp_sharedkey_t;
 
 LIST_HEAD(sctp_keyhead, sctp_shared_key);
 
@@ -72,14 +72,14 @@ LIST_HEAD(sctp_keyhead, sctp_shared_key)
 typedef struct sctp_auth_chklist {
        uint8_t chunks[256];
        uint8_t num_chunks;
-}                 sctp_auth_chklist_t;
+} sctp_auth_chklist_t;
 
 /* hmac algos supported list */
 typedef struct sctp_hmaclist {
        uint16_t max_algo;      /* max algorithms allocated */
        uint16_t num_algo;      /* num algorithms used */
        uint16_t hmac[];
-}             sctp_hmaclist_t;
+} sctp_hmaclist_t;
 
 /* authentication info */
 typedef struct sctp_authinformation {
@@ -91,7 +91,7 @@ typedef struct sctp_authinformation {
        uint16_t active_keyid;  /* active send keyid */
        uint16_t assoc_keyid;   /* current send keyid (cached) */
        uint16_t recv_keyid;    /* last recv keyid (cached) */
-}                    sctp_authinfo_t;
+} sctp_authinfo_t;
 
 
 
@@ -106,42 +106,42 @@ typedef struct sctp_authinformation {
 
 /* socket option api functions */
 extern sctp_auth_chklist_t *sctp_alloc_chunklist(void);
-extern void sctp_free_chunklist(sctp_auth_chklist_t * chklist);
-extern void sctp_clear_chunklist(sctp_auth_chklist_t * chklist);
-extern sctp_auth_chklist_t *sctp_copy_chunklist(sctp_auth_chklist_t * chklist);
-extern int sctp_auth_add_chunk(uint8_t chunk, sctp_auth_chklist_t * list);
-extern int sctp_auth_delete_chunk(uint8_t chunk, sctp_auth_chklist_t * list);
-extern size_t sctp_auth_get_chklist_size(const sctp_auth_chklist_t * list);
+extern void sctp_free_chunklist(sctp_auth_chklist_t *chklist);
+extern void sctp_clear_chunklist(sctp_auth_chklist_t *chklist);
+extern sctp_auth_chklist_t *sctp_copy_chunklist(sctp_auth_chklist_t *chklist);
+extern int sctp_auth_add_chunk(uint8_t chunk, sctp_auth_chklist_t *list);
+extern int sctp_auth_delete_chunk(uint8_t chunk, sctp_auth_chklist_t *list);
+extern size_t sctp_auth_get_chklist_size(const sctp_auth_chklist_t *list);
 extern int 
-sctp_serialize_auth_chunks(const sctp_auth_chklist_t * list,
-    uint8_t * ptr);
+sctp_serialize_auth_chunks(const sctp_auth_chklist_t *list,
+    uint8_t *ptr);
 extern int 
-sctp_pack_auth_chunks(const sctp_auth_chklist_t * list,
-    uint8_t * ptr);
+sctp_pack_auth_chunks(const sctp_auth_chklist_t *list,
+    uint8_t *ptr);
 extern int 
-sctp_unpack_auth_chunks(const uint8_t * ptr, uint8_t num_chunks,
-    sctp_auth_chklist_t * list);
+sctp_unpack_auth_chunks(const uint8_t *ptr, uint8_t num_chunks,
+    sctp_auth_chklist_t *list);
 
 /* key handling */
 extern sctp_key_t *sctp_alloc_key(uint32_t keylen);
-extern void sctp_free_key(sctp_key_t * key);
-extern void sctp_print_key(sctp_key_t * key, const char *str);
-extern void sctp_show_key(sctp_key_t * key, const char *str);
+extern void sctp_free_key(sctp_key_t *key);
+extern void sctp_print_key(sctp_key_t *key, const char *str);
+extern void sctp_show_key(sctp_key_t *key, const char *str);
 extern sctp_key_t *sctp_generate_random_key(uint32_t keylen);
-extern sctp_key_t *sctp_set_key(uint8_t * key, uint32_t keylen);
+extern sctp_key_t *sctp_set_key(uint8_t *key, uint32_t keylen);
 extern sctp_key_t *
-sctp_compute_hashkey(sctp_key_t * key1, sctp_key_t * key2,
-    sctp_key_t * shared);
+sctp_compute_hashkey(sctp_key_t *key1, sctp_key_t *key2,
+    sctp_key_t *shared);
 
 /* shared key handling */
 extern sctp_sharedkey_t *sctp_alloc_sharedkey(void);
-extern void sctp_free_sharedkey(sctp_sharedkey_t * skey);
+extern void sctp_free_sharedkey(sctp_sharedkey_t *skey);
 extern sctp_sharedkey_t *
 sctp_find_sharedkey(struct sctp_keyhead *shared_keys,
     uint16_t key_id);
 extern int 
 sctp_insert_sharedkey(struct sctp_keyhead *shared_keys,
-    sctp_sharedkey_t * new_skey);
+    sctp_sharedkey_t *new_skey);
 extern int 
 sctp_copy_skeylist(const struct sctp_keyhead *src,
     struct sctp_keyhead *dest);
@@ -155,42 +155,42 @@ sctp_auth_key_release(struct sctp_tcb *s
 
 /* hmac list handling */
 extern sctp_hmaclist_t *sctp_alloc_hmaclist(uint16_t num_hmacs);
-extern void sctp_free_hmaclist(sctp_hmaclist_t * list);
-extern int sctp_auth_add_hmacid(sctp_hmaclist_t * list, uint16_t hmac_id);
-extern sctp_hmaclist_t *sctp_copy_hmaclist(sctp_hmaclist_t * list);
+extern void sctp_free_hmaclist(sctp_hmaclist_t *list);
+extern int sctp_auth_add_hmacid(sctp_hmaclist_t *list, uint16_t hmac_id);
+extern sctp_hmaclist_t *sctp_copy_hmaclist(sctp_hmaclist_t *list);
 extern sctp_hmaclist_t *sctp_default_supported_hmaclist(void);
 extern uint16_t 
-sctp_negotiate_hmacid(sctp_hmaclist_t * peer,
-    sctp_hmaclist_t * local);
-extern int sctp_serialize_hmaclist(sctp_hmaclist_t * list, uint8_t * ptr);
+sctp_negotiate_hmacid(sctp_hmaclist_t *peer,
+    sctp_hmaclist_t *local);
+extern int sctp_serialize_hmaclist(sctp_hmaclist_t *list, uint8_t *ptr);
 extern int 
 sctp_verify_hmac_param(struct sctp_auth_hmac_algo *hmacs,
     uint32_t num_hmacs);
 
 extern sctp_authinfo_t *sctp_alloc_authinfo(void);
-extern void sctp_free_authinfo(sctp_authinfo_t * authinfo);
+extern void sctp_free_authinfo(sctp_authinfo_t *authinfo);
 
 /* keyed-HMAC functions */
 extern uint32_t sctp_get_auth_chunk_len(uint16_t hmac_algo);
 extern uint32_t sctp_get_hmac_digest_len(uint16_t hmac_algo);
 extern uint32_t 
-sctp_hmac(uint16_t hmac_algo, uint8_t * key, uint32_t keylen,
-    uint8_t * text, uint32_t textlen, uint8_t * digest);
+sctp_hmac(uint16_t hmac_algo, uint8_t *key, uint32_t keylen,
+    uint8_t *text, uint32_t textlen, uint8_t *digest);
 extern int 
-sctp_verify_hmac(uint16_t hmac_algo, uint8_t * key, uint32_t keylen,
-    uint8_t * text, uint32_t textlen, uint8_t * digest, uint32_t digestlen);
+sctp_verify_hmac(uint16_t hmac_algo, uint8_t *key, uint32_t keylen,
+    uint8_t *text, uint32_t textlen, uint8_t *digest, uint32_t digestlen);
 extern uint32_t 
-sctp_compute_hmac(uint16_t hmac_algo, sctp_key_t * key,
-    uint8_t * text, uint32_t textlen, uint8_t * digest);
-extern int sctp_auth_is_supported_hmac(sctp_hmaclist_t * list, uint16_t id);
+sctp_compute_hmac(uint16_t hmac_algo, sctp_key_t *key,
+    uint8_t *text, uint32_t textlen, uint8_t *digest);
+extern int sctp_auth_is_supported_hmac(sctp_hmaclist_t *list, uint16_t id);
 
 /* mbuf versions */
 extern uint32_t 
-sctp_hmac_m(uint16_t hmac_algo, uint8_t * key, uint32_t keylen,
-    struct mbuf *m, uint32_t m_offset, uint8_t * digest, uint32_t trailer);
+sctp_hmac_m(uint16_t hmac_algo, uint8_t *key, uint32_t keylen,
+    struct mbuf *m, uint32_t m_offset, uint8_t *digest, uint32_t trailer);
 extern uint32_t 
-sctp_compute_hmac_m(uint16_t hmac_algo, sctp_key_t * key,
-    struct mbuf *m, uint32_t m_offset, uint8_t * digest);
+sctp_compute_hmac_m(uint16_t hmac_algo, sctp_key_t *key,
+    struct mbuf *m, uint32_t m_offset, uint8_t *digest);
 
 /*
  * authentication routines
@@ -212,7 +212,7 @@ sctp_fill_hmac_digest_m(struct mbuf *m, 
     struct sctp_auth_chunk *auth, struct sctp_tcb *stcb, uint16_t key_id);
 extern struct mbuf *
 sctp_add_auth_chunk(struct mbuf *m, struct mbuf **m_end,
-    struct sctp_auth_chunk **auth_ret, uint32_t * offset,
+    struct sctp_auth_chunk **auth_ret, uint32_t *offset,
     struct sctp_tcb *stcb, uint8_t chunk);
 extern int 
 sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *ch,

Modified: stable/11/sys/netinet/sctp_bsd_addr.c
==============================================================================
--- stable/11/sys/netinet/sctp_bsd_addr.c       Thu Dec 29 11:25:41 2016        
(r310772)
+++ stable/11/sys/netinet/sctp_bsd_addr.c       Thu Dec 29 11:32:42 2016        
(r310773)
@@ -477,7 +477,7 @@ again_locked:
        lenat++;
        *lenat = value;
        lenat++;
-       tick_tock = (uint32_t *) lenat;
+       tick_tock = (uint32_t *)lenat;
        lenat++;
        *tick_tock = sctp_get_tick_count();
        copyto = (void *)lenat;
@@ -498,7 +498,7 @@ no_log:
 
 
 int
-sctp_copy_out_packet_log(uint8_t * target, int length)
+sctp_copy_out_packet_log(uint8_t *target, int length)
 {
        /*
         * We wind through the packet log starting at start copying up to

Modified: stable/11/sys/netinet/sctp_bsd_addr.h
==============================================================================
--- stable/11/sys/netinet/sctp_bsd_addr.h       Thu Dec 29 11:25:41 2016        
(r310772)
+++ stable/11/sys/netinet/sctp_bsd_addr.h       Thu Dec 29 11:32:42 2016        
(r310773)
@@ -53,7 +53,7 @@ void sctp_gather_internal_ifa_flags(stru
 #ifdef  SCTP_PACKET_LOGGING
 
 void sctp_packet_log(struct mbuf *m);
-int sctp_copy_out_packet_log(uint8_t * target, int length);
+int sctp_copy_out_packet_log(uint8_t *target, int length);
 
 #endif
 

Modified: stable/11/sys/netinet/sctp_cc_functions.c
==============================================================================
--- stable/11/sys/netinet/sctp_cc_functions.c   Thu Dec 29 11:25:41 2016        
(r310772)
+++ stable/11/sys/netinet/sctp_cc_functions.c   Thu Dec 29 11:32:42 2016        
(r310773)
@@ -122,7 +122,7 @@ sctp_cwnd_update_after_fr(struct sctp_tc
                        t_ssthresh += net->ssthresh;
                        t_cwnd += net->cwnd;
                        if (net->lastsa > 0) {
-                               t_ucwnd_sbw += (uint64_t) net->cwnd / 
(uint64_t) net->lastsa;
+                               t_ucwnd_sbw += (uint64_t)net->cwnd / 
(uint64_t)net->lastsa;
                        }
                }
                if (t_ucwnd_sbw == 0) {
@@ -150,27 +150,31 @@ sctp_cwnd_update_after_fr(struct sctp_tc
                                if ((asoc->sctp_cmt_on_off == SCTP_CMT_RPV1) ||
                                    (asoc->sctp_cmt_on_off == SCTP_CMT_RPV2)) {
                                        if (asoc->sctp_cmt_on_off == 
SCTP_CMT_RPV1) {
-                                               net->ssthresh = (uint32_t) 
(((uint64_t) 4 *
-                                                   (uint64_t) net->mtu *
-                                                   (uint64_t) net->ssthresh) /
-                                                   (uint64_t) t_ssthresh);
+                                               net->ssthresh = 
(uint32_t)(((uint64_t)4 *
+                                                   (uint64_t)net->mtu *
+                                                   (uint64_t)net->ssthresh) /
+                                                   (uint64_t)t_ssthresh);
 
                                        }
                                        if (asoc->sctp_cmt_on_off == 
SCTP_CMT_RPV2) {
                                                uint32_t srtt;
 
                                                srtt = net->lastsa;
-                                               /* lastsa>>3;  we don't need
-                                                * to devide ... */
+                                               /*
+                                                * lastsa>>3;  we don't need
+                                                * to devide ...
+                                                */
                                                if (srtt == 0) {
                                                        srtt = 1;
                                                }
-                                               /* Short Version => Equal to
-                                                * Contel Version MBe */
-                                               net->ssthresh = (uint32_t) 
(((uint64_t) 4 *
-                                                   (uint64_t) net->mtu *
-                                                   (uint64_t) net->cwnd) /
-                                                   ((uint64_t) srtt *
+                                               /*
+                                                * Short Version => Equal to
+                                                * Contel Version MBe
+                                                */
+                                               net->ssthresh = 
(uint32_t)(((uint64_t)4 *
+                                                   (uint64_t)net->mtu *
+                                                   (uint64_t)net->cwnd) /
+                                                   ((uint64_t)srtt *
                                                    t_ucwnd_sbw));
                                                 /* INCREASE FACTOR */ ;
                                        }
@@ -249,7 +253,7 @@ cc_bw_same(struct sctp_tcb *stcb, struct
 {
        uint64_t oth, probepoint;
 
-       probepoint = (((uint64_t) net->cwnd) << 32);
+       probepoint = (((uint64_t)net->cwnd) << 32);
        if (net->rtt > net->cc_mod.rtcc.lbw_rtt + rtt_offset) {
                /*
                 * rtt increased we don't update bw.. so we don't update the
@@ -385,7 +389,7 @@ cc_bw_decrease(struct sctp_tcb *stcb, st
        uint64_t oth, probepoint;
 
        /* Bandwidth decreased. */
-       probepoint = (((uint64_t) net->cwnd) << 32);
+       probepoint = (((uint64_t)net->cwnd) << 32);
        if (net->rtt > net->cc_mod.rtcc.lbw_rtt + rtt_offset) {
                /* rtt increased */
                /* Did we add more */
@@ -401,8 +405,10 @@ cc_bw_decrease(struct sctp_tcb *stcb, st
                            net->flight_size,
                            probepoint);
                        if (net->cc_mod.rtcc.ret_from_eq) {
-                               /* Switch over to CA if we are less
-                                * aggressive */
+                               /*
+                                * Switch over to CA if we are less
+                                * aggressive
+                                */
                                net->ssthresh = net->cwnd - 1;
                                net->partial_bytes_acked = 0;
                        }
@@ -528,7 +534,7 @@ cc_bw_increase(struct sctp_tcb *stcb, st
         * attention to the inst_ind since our overall sum is increasing.
         */
        /* PROBE POINT 0 */
-       probepoint = (((uint64_t) net->cwnd) << 32);
+       probepoint = (((uint64_t)net->cwnd) << 32);
        SDT_PROBE5(sctp, cwnd, net, rttvar,
            vtag,
            ((net->cc_mod.rtcc.lbw << 32) | nbw),
@@ -610,8 +616,8 @@ cc_bw_limit(struct sctp_tcb *stcb, struc
         */
        bw_shift = SCTP_BASE_SYSCTL(sctp_rttvar_bw);
        rtt = stcb->asoc.my_vtag;
-       vtag = (rtt << 32) | (((uint32_t) (stcb->sctp_ep->sctp_lport)) << 16) | 
(stcb->rport);
-       probepoint = (((uint64_t) net->cwnd) << 32);
+       vtag = (rtt << 32) | (((uint32_t)(stcb->sctp_ep->sctp_lport)) << 16) | 
(stcb->rport);
+       probepoint = (((uint64_t)net->cwnd) << 32);
        rtt = net->rtt;
        if (net->cc_mod.rtcc.rtt_set_this_sack) {
                net->cc_mod.rtcc.rtt_set_this_sack = 0;
@@ -631,7 +637,7 @@ cc_bw_limit(struct sctp_tcb *stcb, struc
                                probepoint |= ((0xb << 16) | inst_ind);
                        } else {
                                inst_ind = net->cc_mod.rtcc.last_inst_ind;
-                               inst_bw = bytes_for_this_rtt / (uint64_t) 
(net->rtt);
+                               inst_bw = bytes_for_this_rtt / 
(uint64_t)(net->rtt);
                                /* Can't determine do not change */
                                probepoint |= ((0xc << 16) | inst_ind);
                        }
@@ -703,11 +709,11 @@ sctp_cwnd_update_after_sack_common(struc
                        if (srtt > 0) {
                                uint64_t tmp;
 
-                               t_ucwnd_sbw += (uint64_t) net->cwnd / 
(uint64_t) srtt;
-                               t_path_mptcp += (((uint64_t) net->cwnd) << 
SHIFT_MPTCP_MULTI_Z) /
-                                   (((uint64_t) net->mtu) * (uint64_t) srtt);
-                               tmp = (((uint64_t) net->cwnd) << 
SHIFT_MPTCP_MULTI_N) /
-                                   ((uint64_t) net->mtu * (uint64_t) (srtt * 
srtt));

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to