diff options
Diffstat (limited to 'include/net/sctp')
| -rw-r--r-- | include/net/sctp/command.h | 2 | ||||
| -rw-r--r-- | include/net/sctp/sctp.h | 4 | ||||
| -rw-r--r-- | include/net/sctp/structs.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index 6114c4f54b0a..f56c8d695a82 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h | |||
| @@ -100,6 +100,8 @@ typedef enum { | |||
| 100 | SCTP_CMD_T3_RTX_TIMERS_STOP, /* Stops T3-rtx pending timers */ | 100 | SCTP_CMD_T3_RTX_TIMERS_STOP, /* Stops T3-rtx pending timers */ |
| 101 | SCTP_CMD_FORCE_PRIM_RETRAN, /* Forces retrans. over primary path. */ | 101 | SCTP_CMD_FORCE_PRIM_RETRAN, /* Forces retrans. over primary path. */ |
| 102 | SCTP_CMD_SET_SK_ERR, /* Set sk_err */ | 102 | SCTP_CMD_SET_SK_ERR, /* Set sk_err */ |
| 103 | SCTP_CMD_ASSOC_CHANGE, /* generate and send assoc_change event */ | ||
| 104 | SCTP_CMD_ADAPTATION_IND, /* generate and send adaptation event */ | ||
| 103 | SCTP_CMD_LAST | 105 | SCTP_CMD_LAST |
| 104 | } sctp_verb_t; | 106 | } sctp_verb_t; |
| 105 | 107 | ||
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 28af68059521..dda72bf5b9b4 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -378,11 +378,15 @@ static inline int sctp_sysctl_jiffies_ms(ctl_table *table, int __user *name, int | |||
| 378 | 378 | ||
| 379 | int sctp_v6_init(void); | 379 | int sctp_v6_init(void); |
| 380 | void sctp_v6_exit(void); | 380 | void sctp_v6_exit(void); |
| 381 | int sctp_v6_add_protocol(void); | ||
| 382 | void sctp_v6_del_protocol(void); | ||
| 381 | 383 | ||
| 382 | #else /* #ifdef defined(CONFIG_IPV6) */ | 384 | #else /* #ifdef defined(CONFIG_IPV6) */ |
| 383 | 385 | ||
| 384 | static inline int sctp_v6_init(void) { return 0; } | 386 | static inline int sctp_v6_init(void) { return 0; } |
| 385 | static inline void sctp_v6_exit(void) { return; } | 387 | static inline void sctp_v6_exit(void) { return; } |
| 388 | static inline int sctp_v6_add_protocol(void) { return 0; } | ||
| 389 | static inline void sctp_v6_del_protocol(void) { return; } | ||
| 386 | 390 | ||
| 387 | #endif /* #if defined(CONFIG_IPV6) */ | 391 | #endif /* #if defined(CONFIG_IPV6) */ |
| 388 | 392 | ||
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 7b4fff93ba7f..5e81984b8478 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
| @@ -1857,6 +1857,7 @@ int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *, | |||
| 1857 | int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *, | 1857 | int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *, |
| 1858 | struct sctp_cookie*, | 1858 | struct sctp_cookie*, |
| 1859 | gfp_t gfp); | 1859 | gfp_t gfp); |
| 1860 | int sctp_assoc_set_id(struct sctp_association *, gfp_t); | ||
| 1860 | 1861 | ||
| 1861 | int sctp_cmp_addr_exact(const union sctp_addr *ss1, | 1862 | int sctp_cmp_addr_exact(const union sctp_addr *ss1, |
| 1862 | const union sctp_addr *ss2); | 1863 | const union sctp_addr *ss2); |
