summaryrefslogtreecommitdiff
path: root/drivers/dahdi/wcb4xxp
diff options
context:
space:
mode:
authorMatthew Fredrickson <creslin@digium.com>2010-07-22 15:28:53 +0000
committerMatthew Fredrickson <creslin@digium.com>2010-07-22 15:28:53 +0000
commite8594287a11ed9620428816715101a3ba4466a04 (patch)
treee09d44ff05df675406245857c5b613cc563b9459 /drivers/dahdi/wcb4xxp
parentf1e75dfcbe0bc7d13772211fa58004240aeb79cd (diff)
Make sure we also change the deflaw of the span to ulaw if alawoverride is disabled.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8969 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wcb4xxp')
-rw-r--r--drivers/dahdi/wcb4xxp/base.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c
index c1770b6..3e159bb 100644
--- a/drivers/dahdi/wcb4xxp/base.c
+++ b/drivers/dahdi/wcb4xxp/base.c
@@ -2328,7 +2328,10 @@ static void init_spans(struct b4xxp *b4)
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 |