6 files changed, 59 insertions, 59 deletions

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index d8d36dee5ab6..ef36be073a13 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -79,8 +79,8 @@
 #include <asm/uaccess.h>
 
 /* Event handler for inet6 address addition/deletion events.  */
-int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev,
-                        void *ptr)
+static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev,
+                                void *ptr)
 {
         struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr;
         struct sctp_sockaddr_entry *addr;
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 3a3db56729ce..225f39b5d595 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -601,8 +601,8 @@ static void sctp_v4_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr)
 }
 
 /* Event handler for inet address addition/deletion events.  */
-int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
-                        void *ptr)
+static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
+                               void *ptr)
 {
         struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
         struct sctp_sockaddr_entry *addr;
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 30927d3a597f..f0bbe36799cf 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -184,7 +184,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
         struct sctp_sock *sp;
         sctp_supported_addrs_param_t sat;
         __be16 types[2];
-        sctp_adaption_ind_param_t aiparam;
+        sctp_adaptation_ind_param_t aiparam;
 
         /* RFC 2960 3.3.2 Initiation (INIT) (1)
          *
@@ -249,9 +249,9 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
         sctp_addto_chunk(retval, sizeof(ecap_param), &ecap_param);
         if (sctp_prsctp_enable)
                 sctp_addto_chunk(retval, sizeof(prsctp_param), &prsctp_param);
-        aiparam.param_hdr.type = SCTP_PARAM_ADAPTION_LAYER_IND;
+        aiparam.param_hdr.type = SCTP_PARAM_ADAPTATION_LAYER_IND;
         aiparam.param_hdr.length = htons(sizeof(aiparam));
-        aiparam.adaption_ind = htonl(sp->adaption_ind);
+        aiparam.adaptation_ind = htonl(sp->adaptation_ind);
         sctp_addto_chunk(retval, sizeof(aiparam), &aiparam);
 nodata:
         kfree(addrs.v);
@@ -269,7 +269,7 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
         sctp_cookie_param_t *cookie;
         int cookie_len;
         size_t chunksize;
-        sctp_adaption_ind_param_t aiparam;
+        sctp_adaptation_ind_param_t aiparam;
 
         retval = NULL;
 
@@ -323,9 +323,9 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
         if (asoc->peer.prsctp_capable)
                 sctp_addto_chunk(retval, sizeof(prsctp_param), &prsctp_param);
 
-        aiparam.param_hdr.type = SCTP_PARAM_ADAPTION_LAYER_IND;
+        aiparam.param_hdr.type = SCTP_PARAM_ADAPTATION_LAYER_IND;
         aiparam.param_hdr.length = htons(sizeof(aiparam));
-        aiparam.adaption_ind = htonl(sctp_sk(asoc->base.sk)->adaption_ind);
+        aiparam.adaptation_ind = htonl(sctp_sk(asoc->base.sk)->adaptation_ind);
         sctp_addto_chunk(retval, sizeof(aiparam), &aiparam);
 
         /* We need to remove the const qualifier at this point.  */
@@ -1300,8 +1300,8 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
         /* Remember PR-SCTP capability. */
         cookie->c.prsctp_capable = asoc->peer.prsctp_capable;
 
-        /* Save adaption indication in the cookie. */
-        cookie->c.adaption_ind = asoc->peer.adaption_ind;
+        /* Save adaptation indication in the cookie. */
+        cookie->c.adaptation_ind = asoc->peer.adaptation_ind;
 
         /* Set an expiration time for the cookie.  */
         do_gettimeofday(&cookie->c.expiration);
@@ -1512,7 +1512,7 @@ no_hmac:
         retval->addip_serial = retval->c.initial_tsn;
         retval->adv_peer_ack_point = retval->ctsn_ack_point;
         retval->peer.prsctp_capable = retval->c.prsctp_capable;
-        retval->peer.adaption_ind = retval->c.adaption_ind;
+        retval->peer.adaptation_ind = retval->c.adaptation_ind;
 
         /* The INIT stuff will be done by the side effects.  */
         return retval;
@@ -1743,7 +1743,7 @@ static int sctp_verify_param(const struct sctp_association *asoc,
         case SCTP_PARAM_HEARTBEAT_INFO:
         case SCTP_PARAM_UNRECOGNIZED_PARAMETERS:
         case SCTP_PARAM_ECN_CAPABLE:
-        case SCTP_PARAM_ADAPTION_LAYER_IND:
+        case SCTP_PARAM_ADAPTATION_LAYER_IND:
                 break;
 
         case SCTP_PARAM_HOST_NAME_ADDRESS:
@@ -2098,8 +2098,8 @@ static int sctp_process_param(struct sctp_association *asoc,
                 asoc->peer.ecn_capable = 1;
                 break;
 
-        case SCTP_PARAM_ADAPTION_LAYER_IND:
-                asoc->peer.adaption_ind = param.aind->adaption_ind;
+        case SCTP_PARAM_ADAPTATION_LAYER_IND:
+                asoc->peer.adaptation_ind = param.aind->adaptation_ind;
                 break;
 
         case SCTP_PARAM_FWD_TSN_SUPPORT:
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 27cc444aaf11..aa51d190bfb2 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -688,12 +688,12 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
                 goto nomem_ev;
 
         /* Sockets API Draft Section 5.3.1.6    
-         * When a peer sends a Adaption Layer Indication parameter , SCTP
+         * When a peer sends a Adaptation Layer Indication parameter , SCTP
          * delivers this notification to inform the application that of the
-         * peers requested adaption layer.
+         * peers requested adaptation layer.
          */
-        if (new_asoc->peer.adaption_ind) {
-                ai_ev = sctp_ulpevent_make_adaption_indication(new_asoc,
+        if (new_asoc->peer.adaptation_ind) {
+                ai_ev = sctp_ulpevent_make_adaptation_indication(new_asoc,
                                                             GFP_ATOMIC);
                 if (!ai_ev)
                         goto nomem_aiev;
@@ -820,12 +820,12 @@ sctp_disposition_t sctp_sf_do_5_1E_ca(const struct sctp_endpoint *ep,
         sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev));
 
         /* Sockets API Draft Section 5.3.1.6
-         * When a peer sends a Adaption Layer Indication parameter , SCTP
+         * When a peer sends a Adaptation Layer Indication parameter , SCTP
          * delivers this notification to inform the application that of the
-         * peers requested adaption layer.
+         * peers requested adaptation layer.
          */
-        if (asoc->peer.adaption_ind) {
-                ev = sctp_ulpevent_make_adaption_indication(asoc, GFP_ATOMIC);
+        if (asoc->peer.adaptation_ind) {
+                ev = sctp_ulpevent_make_adaptation_indication(asoc, GFP_ATOMIC);
                 if (!ev)
                         goto nomem;
 
@@ -1698,12 +1698,12 @@ static sctp_disposition_t sctp_sf_do_dupcook_b(const struct sctp_endpoint *ep,
         sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev));
 
         /* Sockets API Draft Section 5.3.1.6
-         * When a peer sends a Adaption Layer Indication parameter , SCTP
+         * When a peer sends a Adaptation Layer Indication parameter , SCTP
          * delivers this notification to inform the application that of the
-         * peers requested adaption layer.
+         * peers requested adaptation layer.
          */
-        if (asoc->peer.adaption_ind) {
-                ev = sctp_ulpevent_make_adaption_indication(asoc, GFP_ATOMIC);
+        if (asoc->peer.adaptation_ind) {
+                ev = sctp_ulpevent_make_adaptation_indication(asoc, GFP_ATOMIC);
                 if (!ev)
                         goto nomem_ev;
 
@@ -1791,12 +1791,12 @@ static sctp_disposition_t sctp_sf_do_dupcook_d(const struct sctp_endpoint *ep,
                         goto nomem;
 
                 /* Sockets API Draft Section 5.3.1.6
-                 * When a peer sends a Adaption Layer Indication parameter,
+                 * When a peer sends a Adaptation Layer Indication parameter,
                  * SCTP delivers this notification to inform the application
-                 * that of the peers requested adaption layer.
+                 * that of the peers requested adaptation layer.
                  */
-                if (asoc->peer.adaption_ind) {
-                        ai_ev = sctp_ulpevent_make_adaption_indication(asoc,
+                if (asoc->peer.adaptation_ind) {
+                        ai_ev = sctp_ulpevent_make_adaptation_indication(asoc,
                                                                  GFP_ATOMIC);
                         if (!ai_ev)
                                 goto nomem;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index bdd8bd428b64..388d0fb1a377 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -2731,17 +2731,17 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva
         return err;
 }
 
-static int sctp_setsockopt_adaption_layer(struct sock *sk, char __user *optval,
+static int sctp_setsockopt_adaptation_layer(struct sock *sk, char __user *optval,
                                           int optlen)
 {
-        struct sctp_setadaption adaption;
+        struct sctp_setadaptation adaptation;
 
-        if (optlen != sizeof(struct sctp_setadaption))
+        if (optlen != sizeof(struct sctp_setadaptation))
                 return -EINVAL;
-        if (copy_from_user(&adaption, optval, optlen)) 
+        if (copy_from_user(&adaptation, optval, optlen))
                 return -EFAULT;
 
-        sctp_sk(sk)->adaption_ind = adaption.ssb_adaption_ind;
+        sctp_sk(sk)->adaptation_ind = adaptation.ssb_adaptation_ind;
 
         return 0;
 }
@@ -2894,8 +2894,8 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
         case SCTP_MAXSEG:
                 retval = sctp_setsockopt_maxseg(sk, optval, optlen);
                 break;
-        case SCTP_ADAPTION_LAYER:
-                retval = sctp_setsockopt_adaption_layer(sk, optval, optlen);
+        case SCTP_ADAPTATION_LAYER:
+                retval = sctp_setsockopt_adaptation_layer(sk, optval, optlen);
                 break;
         case SCTP_CONTEXT:
                 retval = sctp_setsockopt_context(sk, optval, optlen);
@@ -3123,7 +3123,7 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
         /* User specified fragmentation limit. */
         sp->user_frag         = 0;
 
-        sp->adaption_ind = 0;
+        sp->adaptation_ind = 0;
 
         sp->pf = sctp_get_pf_specific(sk->sk_family);
 
@@ -4210,21 +4210,21 @@ static int sctp_getsockopt_primary_addr(struct sock *sk, int len,
 }
 
 /*
- * 7.1.11  Set Adaption Layer Indicator (SCTP_ADAPTION_LAYER)
+ * 7.1.11  Set Adaptation Layer Indicator (SCTP_ADAPTATION_LAYER)
  *
- * Requests that the local endpoint set the specified Adaption Layer
+ * Requests that the local endpoint set the specified Adaptation Layer
  * Indication parameter for all future INIT and INIT-ACK exchanges.
  */
-static int sctp_getsockopt_adaption_layer(struct sock *sk, int len,
+static int sctp_getsockopt_adaptation_layer(struct sock *sk, int len,
                                   char __user *optval, int __user *optlen)
 {
-        struct sctp_setadaption adaption;
+        struct sctp_setadaptation adaptation;
 
-        if (len != sizeof(struct sctp_setadaption))
+        if (len != sizeof(struct sctp_setadaptation))
                 return -EINVAL;
 
-        adaption.ssb_adaption_ind = sctp_sk(sk)->adaption_ind;
-        if (copy_to_user(optval, &adaption, len))
+        adaptation.ssb_adaptation_ind = sctp_sk(sk)->adaptation_ind;
+        if (copy_to_user(optval, &adaptation, len))
                 return -EFAULT;
 
         return 0;
@@ -4635,8 +4635,8 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
                 retval = sctp_getsockopt_peer_addr_info(sk, len, optval,
                                                         optlen);
                 break;
-        case SCTP_ADAPTION_LAYER:
-                retval = sctp_getsockopt_adaption_layer(sk, len, optval,
+        case SCTP_ADAPTATION_LAYER:
+                retval = sctp_getsockopt_adaptation_layer(sk, len, optval,
                                                         optlen);
                 break;
         case SCTP_CONTEXT:
diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c
index 93ac63b055ba..445e07a7ac4b 100644
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
@@ -609,31 +609,31 @@ fail:
         return NULL;
 }
 
-/* Create and initialize a SCTP_ADAPTION_INDICATION notification.
+/* Create and initialize a SCTP_ADAPTATION_INDICATION notification.
  *
  * Socket Extensions for SCTP
- * 5.3.1.6 SCTP_ADAPTION_INDICATION
+ * 5.3.1.6 SCTP_ADAPTATION_INDICATION
  */
-struct sctp_ulpevent *sctp_ulpevent_make_adaption_indication(
+struct sctp_ulpevent *sctp_ulpevent_make_adaptation_indication(
         const struct sctp_association *asoc, gfp_t gfp)
 {
         struct sctp_ulpevent *event;
-        struct sctp_adaption_event *sai;
+        struct sctp_adaptation_event *sai;
         struct sk_buff *skb;
 
-        event = sctp_ulpevent_new(sizeof(struct sctp_adaption_event),
+        event = sctp_ulpevent_new(sizeof(struct sctp_adaptation_event),
                                   MSG_NOTIFICATION, gfp);
         if (!event)
                 goto fail;
 
         skb = sctp_event2skb(event);
-        sai = (struct sctp_adaption_event *)
-                skb_put(skb, sizeof(struct sctp_adaption_event));
+        sai = (struct sctp_adaptation_event *)
+                skb_put(skb, sizeof(struct sctp_adaptation_event));
 
-        sai->sai_type = SCTP_ADAPTION_INDICATION;
+        sai->sai_type = SCTP_ADAPTATION_INDICATION;
         sai->sai_flags = 0;
-        sai->sai_length = sizeof(struct sctp_adaption_event);
-        sai->sai_adaption_ind = asoc->peer.adaption_ind;
+        sai->sai_length = sizeof(struct sctp_adaptation_event);
+        sai->sai_adaptation_ind = asoc->peer.adaptation_ind;
         sctp_ulpevent_set_owner(event, asoc);
         sai->sai_assoc_id = sctp_assoc2id(asoc);