diff options
author | John Högberg <[email protected]> | 2017-10-25 08:52:04 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2017-10-25 08:52:04 +0200 |
commit | c26f0e58f440859abbfb9b4e3570713ac722e0da (patch) | |
tree | 6bcbc29c8f4501c05a598262787ef06fb5a7666c /lib/snmp/src/manager/snmpm_net_if.erl | |
parent | 541ee20b9eaefed7802f08cecddfbd12e5f3b516 (diff) | |
parent | a98379d0519c28f9bc9b673ed2c09fb1ad52456e (diff) | |
download | otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.tar.gz otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.tar.bz2 otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.zip |
Merge branch 'maint-20' into maint
* maint-20:
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 -> |