lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCTP]: Fix typo adaption -> adaptation as per the latest API draft.

Browse Source 
Signed-off-by: Ivan Skytte Jorgensen <isj-sctp@i1.dk>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ivan Skytte Jorgensen
2006-12-20 16:07:04 -08:00
committed by David S. Miller
parent a3f7f142f7
commit 0f3fffd8ab
8 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
net/sctp/socket.c
View File

@@ -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: