[svn-commits] mattf: linux/trunk r8969 - /linux/trunk/drivers/dahdi/wcb4xxp/base.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Thu Jul 22 10:28:53 2010
New Revision: 8969

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8969
Log:
Make sure we also change the deflaw of the span to ulaw if alawoverride is disabled.

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

Modified: linux/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=8969&r1=8968&r2=8969
==============================================================================
--- linux/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcb4xxp/base.c Thu Jul 22 10:28:53 2010
@@ -2328,7 +2328,10 @@
 		bspan->span.channels = WCB4XXP_CHANNELS_PER_SPAN;
 		bspan->span.flags = 0;
 
-		bspan->span.deflaw = DAHDI_LAW_ALAW;
+		if (alawoverride)	
+			bspan->span.deflaw = DAHDI_LAW_ALAW;
+		else
+			bspan->span.deflaw = DAHDI_LAW_MULAW;
 		/* For simplicty, we'll accept all line modes since BRI
 		 * ignores this setting anyway.*/
 		bspan->span.linecompat = DAHDI_CONFIG_AMI |