diff options
author | John Högberg <[email protected]> | 2017-10-25 08:58:33 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2017-10-25 08:58:33 +0200 |
commit | 40e787f289a240e6a6b12e03b9501dc492c89aa9 (patch) | |
tree | 1298495e187d9830935c85c8fae691d8f3ba8a27 /lib/snmp/src/manager/snmpm_net_if.erl | |
parent | 9bbe5884cf620aa1c70b92b6e0f3a9d5c3866a9c (diff) | |
parent | c26f0e58f440859abbfb9b4e3570713ac722e0da (diff) | |
download | otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.tar.gz otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.tar.bz2 otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
erts: Fix so that bind correct schedulers
Update version
Fix error handling when decoding an AVP with an alternate dictionary
Remove unused function arguments
Fix faulty recursion
vsn -> 2.1.2
Update appup for ERIERL-14684
Fix speling error 'sndbuf' -> 'recbuf'
Add zlib:set_controlling_process/2
Diffstat (limited to 'lib/snmp/src/manager/snmpm_net_if.erl')
-rw-r--r-- | lib/snmp/src/manager/snmpm_net_if.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl index 93c987eb0f..29216f9d6a 100644 --- a/lib/snmp/src/manager/snmpm_net_if.erl +++ b/lib/snmp/src/manager/snmpm_net_if.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2015. All Rights Reserved. +%% Copyright Ericsson AB 2004-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -367,7 +367,7 @@ common_socket_opts(Opts) -> default -> []; Sz -> - [{sndbuf, Sz}] + [{recbuf, Sz}] end ++ case get_opt(Opts, no_reuse, false) of false -> |