[svn-commits] kpfleming: linux/trunk r6544 - in /linux/trunk/drivers/dahdi: wct4xxp/ wctdm2...

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Apr 30 14:49:36 2009
New Revision: 6544

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6544
Log:
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


Modified:
    linux/trunk/drivers/dahdi/wct4xxp/base.c
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=6544&r1=6543&r2=6544
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Thu Apr 30 14:49:36 2009
@@ -1661,7 +1661,8 @@
 		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;
 		}

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=6544&r1=6543&r2=6544
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Thu Apr 30 14:49:36 2009
@@ -3254,7 +3254,8 @@
 	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);
 

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=6544&r1=6543&r2=6544
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Thu Apr 30 14:49:36 2009
@@ -1232,7 +1232,8 @@
 	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) {