[svn-commits] sruffell: linux/trunk r10228 - /linux/trunk/drivers/dahdi/wctdm24xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Oct 20 15:51:53 2011
New Revision: 10228

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10228
Log:
wctdm24xxp: Setup all VPMADT032 channels on hybrid cards.

r10160 "wctdm24xxp: Probe for and configure modules in parallel."
did not properly setup the VPMADT032 for all ports on hybrid cards.
The most immediate sympton being that spans 3 and up on a hybrid
card would not come up in Asterisk even though they were out of
alarm. This was because the echo canceler was blocking messages on
the dchannels.

This does not affect any previously released versions of DAHDI-Linux
or users of the VPMOCT032.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Michael Spiceland <mspiceland at digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>

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

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=10228&r1=10227&r2=10228
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Thu Oct 20 15:51:53 2011
@@ -4596,7 +4596,15 @@
 	options.vpmnlptype = vpmnlptype;
 	options.vpmnlpthresh = vpmnlpthresh;
 	options.vpmnlpmaxsupp = vpmnlpmaxsupp;
-	options.channels = wc->desc->ports;
+	if (is_hx8(wc)) {
+		/* Hybrid cards potentially have 3 channels of EC on their
+		 * ports since they may be BRI spans. */
+		options.channels = 3 * wc->desc->ports;
+	} else {
+		options.channels = wc->desc->ports;
+	}
+
+	BUG_ON(options.channels > 24);
 
 	wc->vpmadt032 = vpmadt032_alloc(&options);
 	if (!wc->vpmadt032)