Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f3fffd8 authored by Ivan Skytte Jorgensen's avatar Ivan Skytte Jorgensen Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarIvan Skytte Jorgensen <isj-sctp@i1.dk>
Signed-off-by: default avatarSridhar Samudrala <sri@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3f7f142

include/linux/sctp.h

+5 −5
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ typedef enum { 
	SCTP_PARAM_ERR_CAUSE		= __constant_htons(0xc003),

	SCTP_PARAM_SET_PRIMARY		= __constant_htons(0xc004),

	SCTP_PARAM_SUCCESS_REPORT	= __constant_htons(0xc005),

	SCTP_PARAM_ADAPTION_LAYER_IND   = __constant_htons(0xc006),

	SCTP_PARAM_ADAPTATION_LAYER_IND = __constant_htons(0xc006),



} sctp_param_t; /* enum */
@@ -281,11 +281,11 @@ typedef struct sctp_ecn_capable_param { 
	sctp_paramhdr_t param_hdr;

} __attribute__((packed)) sctp_ecn_capable_param_t;



/* ADDIP Section 3.2.6 Adaption Layer Indication */

typedef struct sctp_adaption_ind_param {

/* ADDIP Section 3.2.6 Adaptation Layer Indication */

typedef struct sctp_adaptation_ind_param {

	struct sctp_paramhdr param_hdr;

	__be32 adaption_ind;

} __attribute__((packed)) sctp_adaption_ind_param_t;

	__be32 adaptation_ind;

} __attribute__((packed)) sctp_adaptation_ind_param_t;



/* RFC 2960.  Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):

 *   The INIT ACK chunk is used to acknowledge the initiation of an SCTP

include/net/sctp/structs.h

+4 −4
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ struct sctp_sock { 
	__u8 disable_fragments;

	__u8 pd_mode;

	__u8 v4mapped;

	__u32 adaption_ind;

	__u32 adaptation_ind;



	/* Receive to here while partial delivery is in effect. */

	struct sk_buff_head pd_lobby;
@@ -388,7 +388,7 @@ struct sctp_cookie { 
	/* Padding for future use */

	__u8 padding;  		



	__u32 adaption_ind;	

	__u32 adaptation_ind;





	/* This is a shim for my peer's INIT packet, followed by
@@ -431,7 +431,7 @@ union sctp_params { 
	struct sctp_ipv4addr_param *v4;

	struct sctp_ipv6addr_param *v6;

	union sctp_addr_param *addr;

	struct sctp_adaption_ind_param *aind;

	struct sctp_adaptation_ind_param *aind;

};



/* RFC 2960.  Section 3.3.5 Heartbeat.
@@ -1483,7 +1483,7 @@ struct sctp_association { 
		__u8    asconf_capable;  /* Does peer support ADDIP? */

		__u8    prsctp_capable;  /* Can peer do PR-SCTP? */



		__u32   adaption_ind;	 /* Adaption Code point. */

		__u32   adaptation_ind;	 /* Adaptation Code point. */



		/* This mask is used to disable sending the ASCONF chunk

		 * with specified parameter to peer.

include/net/sctp/ulpevent.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_pdapi( 
	const struct sctp_association *asoc,

	__u32 indication, gfp_t gfp);



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 *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,

include/net/sctp/user.h

+14 −14
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ enum sctp_optname { 
#define SCTP_SET_PEER_PRIMARY_ADDR SCTP_SET_PEER_PRIMARY_ADDR

	SCTP_PRIMARY_ADDR,

#define SCTP_PRIMARY_ADDR SCTP_PRIMARY_ADDR

	SCTP_ADAPTION_LAYER,      

#define SCTP_ADAPTION_LAYER SCTP_ADAPTION_LAYER

	SCTP_ADAPTATION_LAYER,

#define SCTP_ADAPTATION_LAYER SCTP_ADAPTATION_LAYER

	SCTP_DISABLE_FRAGMENTS,

#define SCTP_DISABLE_FRAGMENTS SCTP_DISABLE_FRAGMENTS

	SCTP_PEER_ADDR_PARAMS,
@@ -331,17 +331,17 @@ struct sctp_shutdown_event { 
};



/*

 * 5.3.1.6 SCTP_ADAPTION_INDICATION

 * 5.3.1.6 SCTP_ADAPTATION_INDICATION

 *

 *   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.

 *   that of the peers requested adaptation layer.

 */

struct sctp_adaption_event {

struct sctp_adaptation_event {

	__u16 sai_type;

	__u16 sai_flags;

	__u32 sai_length;

	__u32 sai_adaption_ind;

	__u32 sai_adaptation_ind;

	sctp_assoc_t sai_assoc_id;

};
@@ -374,7 +374,7 @@ struct sctp_event_subscribe { 
	__u8 sctp_peer_error_event;

	__u8 sctp_shutdown_event;

	__u8 sctp_partial_delivery_event;

	__u8 sctp_adaption_layer_event;

	__u8 sctp_adaptation_layer_event;

};



/*
@@ -395,7 +395,7 @@ union sctp_notification { 
	struct sctp_remote_error sn_remote_error;

	struct sctp_send_failed sn_send_failed;

	struct sctp_shutdown_event sn_shutdown_event;

	struct sctp_adaption_event sn_adaption_event;

	struct sctp_adaptation_event sn_adaptation_event;

	struct sctp_pdapi_event sn_pdapi_event;

};
@@ -412,7 +412,7 @@ enum sctp_sn_type { 
	SCTP_REMOTE_ERROR,

	SCTP_SHUTDOWN_EVENT,

	SCTP_PARTIAL_DELIVERY_EVENT,

	SCTP_ADAPTION_INDICATION,

	SCTP_ADAPTATION_INDICATION,

};



/* Notification error codes used to fill up the error fields in some
@@ -488,13 +488,13 @@ struct sctp_prim { 
} __attribute__((packed, aligned(4)));



/*

 * 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.

 */

struct sctp_setadaption {

	__u32	ssb_adaption_ind;

struct sctp_setadaptation {

	__u32	ssb_adaptation_ind;

};



/*

net/sctp/sm_make_chunk.c

+12 −12
Original line number Diff line number Diff line
@@ -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: