diff options
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r-- | net/sctp/socket.c | 34 |
1 files changed, 17 insertions, 17 deletions
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 | |||
2731 | return err; | 2731 | return err; |
2732 | } | 2732 | } |
2733 | 2733 | ||
2734 | static int sctp_setsockopt_adaption_layer(struct sock *sk, char __user *optval, | 2734 | static int sctp_setsockopt_adaptation_layer(struct sock *sk, char __user *optval, |
2735 | int optlen) | 2735 | int optlen) |
2736 | { | 2736 | { |
2737 | struct sctp_setadaption adaption; | 2737 | struct sctp_setadaptation adaptation; |
2738 | 2738 | ||
2739 | if (optlen != sizeof(struct sctp_setadaption)) | 2739 | if (optlen != sizeof(struct sctp_setadaptation)) |
2740 | return -EINVAL; | 2740 | return -EINVAL; |
2741 | if (copy_from_user(&adaption, optval, optlen)) | 2741 | if (copy_from_user(&adaptation, optval, optlen)) |
2742 | return -EFAULT; | 2742 | return -EFAULT; |
2743 | 2743 | ||
2744 | sctp_sk(sk)->adaption_ind = adaption.ssb_adaption_ind; | 2744 | sctp_sk(sk)->adaptation_ind = adaptation.ssb_adaptation_ind; |
2745 | 2745 | ||
2746 | return 0; | 2746 | return 0; |
2747 | } | 2747 | } |
@@ -2894,8 +2894,8 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname, | |||
2894 | case SCTP_MAXSEG: | 2894 | case SCTP_MAXSEG: |
2895 | retval = sctp_setsockopt_maxseg(sk, optval, optlen); | 2895 | retval = sctp_setsockopt_maxseg(sk, optval, optlen); |
2896 | break; | 2896 | break; |
2897 | case SCTP_ADAPTION_LAYER: | 2897 | case SCTP_ADAPTATION_LAYER: |
2898 | retval = sctp_setsockopt_adaption_layer(sk, optval, optlen); | 2898 | retval = sctp_setsockopt_adaptation_layer(sk, optval, optlen); |
2899 | break; | 2899 | break; |
2900 | case SCTP_CONTEXT: | 2900 | case SCTP_CONTEXT: |
2901 | retval = sctp_setsockopt_context(sk, optval, optlen); | 2901 | retval = sctp_setsockopt_context(sk, optval, optlen); |
@@ -3123,7 +3123,7 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk) | |||
3123 | /* User specified fragmentation limit. */ | 3123 | /* User specified fragmentation limit. */ |
3124 | sp->user_frag = 0; | 3124 | sp->user_frag = 0; |
3125 | 3125 | ||
3126 | sp->adaption_ind = 0; | 3126 | sp->adaptation_ind = 0; |
3127 | 3127 | ||
3128 | sp->pf = sctp_get_pf_specific(sk->sk_family); | 3128 | sp->pf = sctp_get_pf_specific(sk->sk_family); |
3129 | 3129 | ||
@@ -4210,21 +4210,21 @@ static int sctp_getsockopt_primary_addr(struct sock *sk, int len, | |||
4210 | } | 4210 | } |
4211 | 4211 | ||
4212 | /* | 4212 | /* |
4213 | * 7.1.11 Set Adaption Layer Indicator (SCTP_ADAPTION_LAYER) | 4213 | * 7.1.11 Set Adaptation Layer Indicator (SCTP_ADAPTATION_LAYER) |
4214 | * | 4214 | * |
4215 | * Requests that the local endpoint set the specified Adaption Layer | 4215 | * Requests that the local endpoint set the specified Adaptation Layer |
4216 | * Indication parameter for all future INIT and INIT-ACK exchanges. | 4216 | * Indication parameter for all future INIT and INIT-ACK exchanges. |
4217 | */ | 4217 | */ |
4218 | static int sctp_getsockopt_adaption_layer(struct sock *sk, int len, | 4218 | static int sctp_getsockopt_adaptation_layer(struct sock *sk, int len, |
4219 | char __user *optval, int __user *optlen) | 4219 | char __user *optval, int __user *optlen) |
4220 | { | 4220 | { |
4221 | struct sctp_setadaption adaption; | 4221 | struct sctp_setadaptation adaptation; |
4222 | 4222 | ||
4223 | if (len != sizeof(struct sctp_setadaption)) | 4223 | if (len != sizeof(struct sctp_setadaptation)) |
4224 | return -EINVAL; | 4224 | return -EINVAL; |
4225 | 4225 | ||
4226 | adaption.ssb_adaption_ind = sctp_sk(sk)->adaption_ind; | 4226 | adaptation.ssb_adaptation_ind = sctp_sk(sk)->adaptation_ind; |
4227 | if (copy_to_user(optval, &adaption, len)) | 4227 | if (copy_to_user(optval, &adaptation, len)) |
4228 | return -EFAULT; | 4228 | return -EFAULT; |
4229 | 4229 | ||
4230 | return 0; | 4230 | return 0; |
@@ -4635,8 +4635,8 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname, | |||
4635 | retval = sctp_getsockopt_peer_addr_info(sk, len, optval, | 4635 | retval = sctp_getsockopt_peer_addr_info(sk, len, optval, |
4636 | optlen); | 4636 | optlen); |
4637 | break; | 4637 | break; |
4638 | case SCTP_ADAPTION_LAYER: | 4638 | case SCTP_ADAPTATION_LAYER: |
4639 | retval = sctp_getsockopt_adaption_layer(sk, len, optval, | 4639 | retval = sctp_getsockopt_adaptation_layer(sk, len, optval, |
4640 | optlen); | 4640 | optlen); |
4641 | break; | 4641 | break; |
4642 | case SCTP_CONTEXT: | 4642 | case SCTP_CONTEXT: |