aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2011-09-19 11:36:35 +0200
committerRaimo Niskanen <[email protected]>2011-09-19 11:36:35 +0200
commitff371b3b33e435f63962615be06404f6f8af3d5e (patch)
tree557a78eaf20bb1fe415d95fd01905f1417a85366 /erts
parent801ec3847e330b7d67b1e4ae700211380da0d6bd (diff)
downloadotp-ff371b3b33e435f63962615be06404f6f8af3d5e.tar.gz
otp-ff371b3b33e435f63962615be06404f6f8af3d5e.tar.bz2
otp-ff371b3b33e435f63962615be06404f6f8af3d5e.zip
erts: Fix bug SCTP send can only be called from controlling process
Conflicts: lib/kernel/test/gen_sctp_SUITE.erl
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index c6e23ee647..3c4be8eea4 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-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2011. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -6425,8 +6425,7 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen,
i = LOAD_TUPLE(spec, i, 3);
/* Now, convert "spec" into the returnable term: */
- /* desc->caller = 0; What does it mean? */
- driver_output_term(desc->port, spec, i);
+ driver_send_term(desc->port, driver_caller(desc->port), spec, i);
FREE(spec);
(*dest)[0] = INET_REP_SCTP;