summaryrefslogtreecommitdiff
path: root/net/asterisk13/files/patch-channels-chan_dahdi.c
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2014-12-15 14:46:25 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2014-12-15 14:46:25 +0000
commit8962a0c995f536bdf7c495333fe2463b1113fab8 (patch)
treec77ea663141f2f8ae238f15729c86904e862740d /net/asterisk13/files/patch-channels-chan_dahdi.c
parentPJSIP is a free and open source multimedia communication library (diff)
Add asterisk13 port.
Fix CONFLICTS for asterisk ports and remove long deleted entries references. Upstream announce: http://blogs.digium.com/2014/10/28/asterisk-13-0-0-now-available/
Diffstat (limited to 'net/asterisk13/files/patch-channels-chan_dahdi.c')
-rw-r--r--net/asterisk13/files/patch-channels-chan_dahdi.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/net/asterisk13/files/patch-channels-chan_dahdi.c b/net/asterisk13/files/patch-channels-chan_dahdi.c
new file mode 100644
index 000000000000..92ff4e0c1954
--- /dev/null
+++ b/net/asterisk13/files/patch-channels-chan_dahdi.c
@@ -0,0 +1,33 @@
+--- channels/chan_dahdi.c.orig 2014-07-25 16:47:17 UTC
++++ channels/chan_dahdi.c
+@@ -4596,6 +4596,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p
+ return;
+ }
+ if (p->echocancel.head.tap_length) {
++ struct dahdi_echocanparams *pecp;
++
+ #if defined(HAVE_PRI) || defined(HAVE_SS7)
+ switch (p->sig) {
+ #if defined(HAVE_PRI)
+@@ -4626,7 +4628,9 @@ 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 {
+@@ -4660,8 +4664,9 @@ void dahdi_ec_disable(struct dahdi_pvt *
+
+ if (p->echocanon) {
+ struct dahdi_echocanparams ecp = { .tap_length = 0 };
++ struct dahdi_echocanparams *pecp = &ecp;
+
+- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &ecp);
++ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
+
+ if (res)
+ ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));