aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/drivers
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-12-04 15:09:47 +0100
committerHenrik Nord <[email protected]>2015-12-04 15:09:47 +0100
commit4dd436b2d887517d50386372946a495aed698663 (patch)
treec36c81d378e88d44f61e02b1325440bc0e3019ed /erts/emulator/drivers
parentc5e3f065998057c2bb304d75f9ec00228bacfc36 (diff)
parent4b5cc477a78247dd68f142d5cb044ff0c34a576b (diff)
downloadotp-4dd436b2d887517d50386372946a495aed698663.tar.gz
otp-4dd436b2d887517d50386372946a495aed698663.tar.bz2
otp-4dd436b2d887517d50386372946a495aed698663.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/drivers')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 1e3360c2b1..e3f5060117 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1997-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2015. 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.
@@ -5762,9 +5762,9 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
int arg_sz;
enum PacketParseType old_htype = desc->htype;
int old_active = desc->active;
- int propagate = 0; /* Set to 1 if failure to set this option
- should be propagated to erlang (not all
- errors can be propagated for BC reasons) */
+ int propagate; /* Set to 1 if failure to set this option
+ should be propagated to erlang (not all
+ errors can be propagated for BC reasons) */
int res;
#ifdef HAVE_SCTP
/* SCTP sockets are treated completely separately: */
@@ -5781,6 +5781,7 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
arg_ptr = (char*) &ival;
arg_sz = sizeof(ival);
proto = SOL_SOCKET;
+ propagate = 0;
switch(opt) {
case INET_LOPT_HEADER: