diff options
author | Sverker Eriksson <[email protected]> | 2016-08-19 14:30:52 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-08-19 14:30:52 +0200 |
commit | 74eea0fbb2cb5d0bb211dad19891d2aae31e170d (patch) | |
tree | cf599434e94471c94b49196758fff1462e542996 /lib/kernel/include | |
parent | 2757590a9d7e092dcbaf15c15354f7ccd0154219 (diff) | |
parent | aa12cfd7a35434f6da89b5c3aaafdc99189f5a98 (diff) | |
download | otp-74eea0fbb2cb5d0bb211dad19891d2aae31e170d.tar.gz otp-74eea0fbb2cb5d0bb211dad19891d2aae31e170d.tar.bz2 otp-74eea0fbb2cb5d0bb211dad19891d2aae31e170d.zip |
Merge branch 'sverker/net_kernel-setopts/OTP-13564' into maint
Diffstat (limited to 'lib/kernel/include')
-rw-r--r-- | lib/kernel/include/dist_util.hrl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/kernel/include/dist_util.hrl b/lib/kernel/include/dist_util.hrl index 43e50d4325..320e916c04 100644 --- a/lib/kernel/include/dist_util.hrl +++ b/lib/kernel/include/dist_util.hrl @@ -63,7 +63,7 @@ f_getll, %% Get low level port or pid. f_address, %% The address of the "socket", %% generated from Socket,Node - %% These two are used in the tick loop, + %% These three are used in the tick loop, %% so they are not fun's to avoid holding old code. mf_tick, %% Takes the socket as parameters and %% sends a tick, this is no fun, it @@ -74,7 +74,11 @@ %% {ok, RecvCnt, SendCnt, SendPend} for %% a given socket. This is a {M,F}, %% returning {error, Reason on failure} - request_type = normal + request_type = normal, + + %% New in kernel-5.1 (OTP 19.1): + mf_setopts, %% netkernel:setopts on active connection + mf_getopts %% netkernel:getopts on active connection }). |