aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sctp/structs.h8
-rw-r--r--include/net/sctp/ulpevent.h2
-rw-r--r--include/net/sctp/user.h28
3 files changed, 19 insertions, 19 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 8d7f26d684e..31a8e88f1a7 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -306,7 +306,7 @@ struct sctp_sock {
306 __u8 disable_fragments; 306 __u8 disable_fragments;
307 __u8 pd_mode; 307 __u8 pd_mode;
308 __u8 v4mapped; 308 __u8 v4mapped;
309 __u32 adaption_ind; 309 __u32 adaptation_ind;
310 310
311 /* Receive to here while partial delivery is in effect. */ 311 /* Receive to here while partial delivery is in effect. */
312 struct sk_buff_head pd_lobby; 312 struct sk_buff_head pd_lobby;
@@ -388,7 +388,7 @@ struct sctp_cookie {
388 /* Padding for future use */ 388 /* Padding for future use */
389 __u8 padding; 389 __u8 padding;
390 390
391 __u32 adaption_ind; 391 __u32 adaptation_ind;
392 392
393 393
394 /* This is a shim for my peer's INIT packet, followed by 394 /* This is a shim for my peer's INIT packet, followed by
@@ -431,7 +431,7 @@ union sctp_params {
431 struct sctp_ipv4addr_param *v4; 431 struct sctp_ipv4addr_param *v4;
432 struct sctp_ipv6addr_param *v6; 432 struct sctp_ipv6addr_param *v6;
433 union sctp_addr_param *addr; 433 union sctp_addr_param *addr;
434 struct sctp_adaption_ind_param *aind; 434 struct sctp_adaptation_ind_param *aind;
435}; 435};
436 436
437/* RFC 2960. Section 3.3.5 Heartbeat. 437/* RFC 2960. Section 3.3.5 Heartbeat.
@@ -1483,7 +1483,7 @@ struct sctp_association {
1483 __u8 asconf_capable; /* Does peer support ADDIP? */ 1483 __u8 asconf_capable; /* Does peer support ADDIP? */
1484 __u8 prsctp_capable; /* Can peer do PR-SCTP? */ 1484 __u8 prsctp_capable; /* Can peer do PR-SCTP? */
1485 1485
1486 __u32 adaption_ind; /* Adaption Code point. */ 1486 __u32 adaptation_ind; /* Adaptation Code point. */
1487 1487
1488 /* This mask is used to disable sending the ASCONF chunk 1488 /* This mask is used to disable sending the ASCONF chunk
1489 * with specified parameter to peer. 1489 * with specified parameter to peer.
diff --git a/include/net/sctp/ulpevent.h b/include/net/sctp/ulpevent.h
index 1a4ddc1ec7d..2923e3d31a0 100644
--- a/include/net/sctp/ulpevent.h
+++ b/include/net/sctp/ulpevent.h
@@ -120,7 +120,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_pdapi(
120 const struct sctp_association *asoc, 120 const struct sctp_association *asoc,
121 __u32 indication, gfp_t gfp); 121 __u32 indication, gfp_t gfp);
122 122
123struct sctp_ulpevent *sctp_ulpevent_make_adaption_indication( 123struct sctp_ulpevent *sctp_ulpevent_make_adaptation_indication(
124 const struct sctp_association *asoc, gfp_t gfp); 124 const struct sctp_association *asoc, gfp_t gfp);
125 125
126struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc, 126struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 9e4a39fd129..67a30eb2b3a 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -75,8 +75,8 @@ enum sctp_optname {
75#define SCTP_SET_PEER_PRIMARY_ADDR SCTP_SET_PEER_PRIMARY_ADDR 75#define SCTP_SET_PEER_PRIMARY_ADDR SCTP_SET_PEER_PRIMARY_ADDR
76 SCTP_PRIMARY_ADDR, 76 SCTP_PRIMARY_ADDR,
77#define SCTP_PRIMARY_ADDR SCTP_PRIMARY_ADDR 77#define SCTP_PRIMARY_ADDR SCTP_PRIMARY_ADDR
78 SCTP_ADAPTION_LAYER, 78 SCTP_ADAPTATION_LAYER,
79#define SCTP_ADAPTION_LAYER SCTP_ADAPTION_LAYER 79#define SCTP_ADAPTATION_LAYER SCTP_ADAPTATION_LAYER
80 SCTP_DISABLE_FRAGMENTS, 80 SCTP_DISABLE_FRAGMENTS,
81#define SCTP_DISABLE_FRAGMENTS SCTP_DISABLE_FRAGMENTS 81#define SCTP_DISABLE_FRAGMENTS SCTP_DISABLE_FRAGMENTS
82 SCTP_PEER_ADDR_PARAMS, 82 SCTP_PEER_ADDR_PARAMS,
@@ -331,17 +331,17 @@ struct sctp_shutdown_event {
331}; 331};
332 332
333/* 333/*
334 * 5.3.1.6 SCTP_ADAPTION_INDICATION 334 * 5.3.1.6 SCTP_ADAPTATION_INDICATION
335 * 335 *
336 * When a peer sends a Adaption Layer Indication parameter , SCTP 336 * When a peer sends a Adaptation Layer Indication parameter , SCTP
337 * delivers this notification to inform the application 337 * delivers this notification to inform the application
338 * that of the peers requested adaption layer. 338 * that of the peers requested adaptation layer.
339 */ 339 */
340struct sctp_adaption_event { 340struct sctp_adaptation_event {
341 __u16 sai_type; 341 __u16 sai_type;
342 __u16 sai_flags; 342 __u16 sai_flags;
343 __u32 sai_length; 343 __u32 sai_length;
344 __u32 sai_adaption_ind; 344 __u32 sai_adaptation_ind;
345 sctp_assoc_t sai_assoc_id; 345 sctp_assoc_t sai_assoc_id;
346}; 346};
347 347
@@ -374,7 +374,7 @@ struct sctp_event_subscribe {
374 __u8 sctp_peer_error_event; 374 __u8 sctp_peer_error_event;
375 __u8 sctp_shutdown_event; 375 __u8 sctp_shutdown_event;
376 __u8 sctp_partial_delivery_event; 376 __u8 sctp_partial_delivery_event;
377 __u8 sctp_adaption_layer_event; 377 __u8 sctp_adaptation_layer_event;
378}; 378};
379 379
380/* 380/*
@@ -395,7 +395,7 @@ union sctp_notification {
395 struct sctp_remote_error sn_remote_error; 395 struct sctp_remote_error sn_remote_error;
396 struct sctp_send_failed sn_send_failed; 396 struct sctp_send_failed sn_send_failed;
397 struct sctp_shutdown_event sn_shutdown_event; 397 struct sctp_shutdown_event sn_shutdown_event;
398 struct sctp_adaption_event sn_adaption_event; 398 struct sctp_adaptation_event sn_adaptation_event;
399 struct sctp_pdapi_event sn_pdapi_event; 399 struct sctp_pdapi_event sn_pdapi_event;
400}; 400};
401 401
@@ -412,7 +412,7 @@ enum sctp_sn_type {
412 SCTP_REMOTE_ERROR, 412 SCTP_REMOTE_ERROR,
413 SCTP_SHUTDOWN_EVENT, 413 SCTP_SHUTDOWN_EVENT,
414 SCTP_PARTIAL_DELIVERY_EVENT, 414 SCTP_PARTIAL_DELIVERY_EVENT,
415 SCTP_ADAPTION_INDICATION, 415 SCTP_ADAPTATION_INDICATION,
416}; 416};
417 417
418/* Notification error codes used to fill up the error fields in some 418/* Notification error codes used to fill up the error fields in some
@@ -488,13 +488,13 @@ struct sctp_prim {
488} __attribute__((packed, aligned(4))); 488} __attribute__((packed, aligned(4)));
489 489
490/* 490/*
491 * 7.1.11 Set Adaption Layer Indicator (SCTP_ADAPTION_LAYER) 491 * 7.1.11 Set Adaptation Layer Indicator (SCTP_ADAPTATION_LAYER)
492 * 492 *
493 * Requests that the local endpoint set the specified Adaption Layer 493 * Requests that the local endpoint set the specified Adaptation Layer
494 * Indication parameter for all future INIT and INIT-ACK exchanges. 494 * Indication parameter for all future INIT and INIT-ACK exchanges.
495 */ 495 */
496struct sctp_setadaption { 496struct sctp_setadaptation {
497 __u32 ssb_adaption_ind; 497 __u32 ssb_adaptation_ind;
498}; 498};
499 499
500/* 500/*