diff options
author | Marcus Arendt <[email protected]> | 2015-01-14 10:40:27 +0100 |
---|---|---|
committer | Marcus Arendt <[email protected]> | 2015-01-14 10:40:27 +0100 |
commit | 06b359e3c126804045b9b14852d14b46c2e1fee9 (patch) | |
tree | 7f9eff2467de5e4d21dfde9ef143688c162a1120 /lib/kernel | |
parent | 0c35538676e6598243721ef0488c2043b62715f2 (diff) | |
parent | 6d49fd3d4d66237924912cc6e6ab3d2512fce728 (diff) | |
download | otp-06b359e3c126804045b9b14852d14b46c2e1fee9.tar.gz otp-06b359e3c126804045b9b14852d14b46c2e1fee9.tar.bz2 otp-06b359e3c126804045b9b14852d14b46c2e1fee9.zip |
Merge branch 'dotsimon/sctp_paddrinfo_state' into maint
* dotsimon/sctp_paddrinfo_state:
Fix inet:getopts involving #sctp_paddrinfo{}
Diffstat (limited to 'lib/kernel')
-rw-r--r-- | lib/kernel/doc/src/gen_sctp.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml index dc9e4766a9..ee8cd441d4 100644 --- a/lib/kernel/doc/src/gen_sctp.xml +++ b/lib/kernel/doc/src/gen_sctp.xml @@ -961,7 +961,7 @@ <pre> #sctp_paddrinfo{ assoc_id = assoc_id(), address = {IP, Port}, - state = inactive | active, + state = inactive | active | unconfirmed, cwnd = integer(), srtt = integer(), rto = integer(), |