From a8b1e2b662fba9e41a25849430e04e1f20c4fb97 Mon Sep 17 00:00:00 2001
From: Shaun Ruffell <sruffell@digium.com>
Date: Wed, 20 Oct 2010 12:22:35 +0000
Subject: [PATCH] vpmadt032: Honor the CONFIG_DAHDI_NO_ECHOCAN_DISABLE flag.

Setting this configuration option would not have had any impact when a
hardware echo canceler was in use.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9432 a0bf4364-ded3-4de4-8d8a-66a801d63aff
---
 drivers/dahdi/voicebus/GpakCust.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/dahdi/voicebus/GpakCust.c b/drivers/dahdi/voicebus/GpakCust.c
index 08ba579..d33779d 100644
--- a/drivers/dahdi/voicebus/GpakCust.c
+++ b/drivers/dahdi/voicebus/GpakCust.c
@@ -759,7 +759,13 @@ void vpmadt032_get_default_parameters(struct GpakEcanParms *p)
 	p->EcanTapLength = 1024;
 	p->EcanNlpType = DEFAULT_NLPTYPE;
 	p->EcanAdaptEnable = 1;
+
+#ifdef CONFIG_DAHDI_NO_ECHOCAN_DISABLE
+	p->EcanG165DetEnable = 0;
+#else
 	p->EcanG165DetEnable = 1;
+#endif
+
 	p->EcanDblTalkThresh = 6;
 	p->EcanMaxDoubleTalkThres = 40;
 	p->EcanNlpThreshold = DEFAULT_NLPTHRESH;