diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-11-29 19:52:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-11-29 19:52:32 +0100 |
| commit | 22b3b41c709b63b1b9dffe6c4d56a5161d972e51 (patch) | |
| tree | 9cb398994a16bfca09c35fe7912c354597b83754 /include/uapi/linux/sctp.h | |
| parent | c94800a3952c71191c3a8a7151695216da43d5eb (diff) | |
| parent | 9e908a180e6a90fa102d5d3f96ca86825f43e4fb (diff) | |
Merge branch 'topic/leds-trigger' into for-next
This is a series of patches for conversion to LEDs audio-mute
trigger. It's based on 4.20-rc3 to be an immutable branch.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/uapi/linux/sctp.h')
| -rw-r--r-- | include/uapi/linux/sctp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h index 34dd3d497f2c..c81feb373d3e 100644 --- a/include/uapi/linux/sctp.h +++ b/include/uapi/linux/sctp.h @@ -568,6 +568,8 @@ struct sctp_assoc_reset_event { #define SCTP_ASSOC_CHANGE_DENIED 0x0004 #define SCTP_ASSOC_CHANGE_FAILED 0x0008 +#define SCTP_STREAM_CHANGE_DENIED SCTP_ASSOC_CHANGE_DENIED +#define SCTP_STREAM_CHANGE_FAILED SCTP_ASSOC_CHANGE_FAILED struct sctp_stream_change_event { __u16 strchange_type; __u16 strchange_flags; @@ -1151,6 +1153,7 @@ struct sctp_add_streams { /* SCTP Stream schedulers */ enum sctp_sched_type { SCTP_SS_FCFS, + SCTP_SS_DEFAULT = SCTP_SS_FCFS, SCTP_SS_PRIO, SCTP_SS_RR, SCTP_SS_MAX = SCTP_SS_RR |