summaryrefslogtreecommitdiff
path: root/net/asterisk13/files/patch-channels-chan_dahdi.c
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2018-01-11 22:48:37 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2018-01-11 22:48:37 +0000
commit29aae1a5472c8dceccf1b60bc3995801af0b7611 (patch)
treebf69ccba9cbfab6d8da4d5f6ccf85029412f4659 /net/asterisk13/files/patch-channels-chan_dahdi.c
parenttextproc/py-html2text: Update to 2018.1.9 (diff)
- Update net/asterisk13 to 13.19.0
- Move MASTER_SITES and WWW to https - Add missing dependencies reported by stage-qa
Diffstat (limited to 'net/asterisk13/files/patch-channels-chan_dahdi.c')
-rw-r--r--net/asterisk13/files/patch-channels-chan_dahdi.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/net/asterisk13/files/patch-channels-chan_dahdi.c b/net/asterisk13/files/patch-channels-chan_dahdi.c
index 94b4d36bfd18..a2ade9ff9a49 100644
--- a/net/asterisk13/files/patch-channels-chan_dahdi.c
+++ b/net/asterisk13/files/patch-channels-chan_dahdi.c
@@ -1,17 +1,5 @@
---- channels/chan_dahdi.c.orig 2017-10-13 17:46:56 UTC
+--- channels/chan_dahdi.c.orig 2017-12-20 19:05:45 UTC
+++ channels/chan_dahdi.c
-@@ -61,10 +61,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
- #include <signal.h>
- #else
- #include <sys/signal.h>
-+#include <sys/sysmacros.h>
- #endif
- #include <sys/stat.h>
- #include <math.h>
--#include <sys/sysmacros.h>
-
- #include "sig_analog.h"
- /* Analog signaling is currently still present in chan_dahdi for use with
@@ -4666,6 +4666,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
return;
}
@@ -21,18 +9,17 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
-@@ -4696,7 +4698,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4696,7 +4698,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
break;
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel);
-+
+ pecp = &p->echocancel.head;
+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
-@@ -4730,8 +4734,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
+@@ -4730,8 +4733,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };