From a3c1757829cfed4b86369e7e21d9fcbf22b1add0 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 30 Apr 2009 19:49:36 +0000 Subject: Ensure that vpmsupport=0 module parameter takes proper effect For these drivers, when the vpmsupport module parameter is set to zero, don't even register the span as supporting echo cancellation. DAHDI-250 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6544 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wct4xxp/base.c | 3 ++- drivers/dahdi/wctdm24xxp/base.c | 3 ++- drivers/dahdi/wcte12xp/base.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 3bfd9cc..96fabde 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -1661,7 +1661,8 @@ static void init_spans(struct t4 *wc) ts->span.hdlc_hard_xmit = t4_hdlc_hard_xmit; if (gen2) { #ifdef VPM_SUPPORT - ts->span.echocan_create = echocan_create; + if (vpmsupport) + ts->span.echocan_create = echocan_create; #endif ts->span.dacs = t4_dacs; } diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 0985a57..7b21b5b 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -3254,7 +3254,8 @@ static int wctdm_initialize(struct wctdm *wc) wc->span.watchdog = wctdm_watchdog; wc->span.dacs= wctdm_dacs; #ifdef VPM_SUPPORT - wc->span.echocan_create = echocan_create; + if (vpmsupport) + wc->span.echocan_create = echocan_create; #endif init_waitqueue_head(&wc->span.maintq); diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 03eb34c..b97cd5f 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -1232,7 +1232,8 @@ static int t1_software_init(struct t1 *wc) wc->span.close = t1xxp_close; wc->span.ioctl = t1xxp_ioctl; #ifdef VPM_SUPPORT - wc->span.echocan_create = echocan_create; + if (vpmsupport) + wc->span.echocan_create = echocan_create; #endif if (wc->spantype == TYPE_E1) { -- cgit v1.2.3