[svn-commits] sruffell: branch linux/2.5 r10253 - /linux/branches/2.5/drivers/dahdi/wcb4xxp/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Oct 21 14:48:20 2011
New Revision: 10253

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10253
Log:
wcb4xxp: Do not show LASVEGAS2 as echocan name if vpmsupport is set to 0

This fixes an issue where "EC: LASVEGAS2" was displayed in /proc/dahdi/x
for a B410P span even though vpmsupport was disabled with the module
parameter.

Internal-Issue-ID: DAHLIN-247
Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10251

Modified:
    linux/branches/2.5/drivers/dahdi/wcb4xxp/base.c

Modified: linux/branches/2.5/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=10253&r1=10252&r2=10253
==============================================================================
--- linux/branches/2.5/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/branches/2.5/drivers/dahdi/wcb4xxp/base.c Fri Oct 21 14:48:20 2011
@@ -2205,7 +2205,7 @@
 {
 	struct b4xxp_span *bspan = container_of(chan->span, struct b4xxp_span,
 						span);
-	if (bspan->parent->card_type == B410P)
+	if (vpmsupport && (B410P == bspan->parent->card_type))
 		return "LASVEGAS2";
 	return NULL;
 }