[svn-commits] rmudgett: branch rmudgett/sig_ss7 r267308 - /team/rmudgett/sig_ss7/channels/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Jun  2 17:13:57 2010
New Revision: 267308

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=267308
Log:
Update Alaw/ulaw handling from call waiting merge.

Modified:
    team/rmudgett/sig_ss7/channels/chan_dahdi.c

Modified: team/rmudgett/sig_ss7/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/sig_ss7/channels/chan_dahdi.c?view=diff&rev=267308&r1=267307&r2=267308
==============================================================================
--- team/rmudgett/sig_ss7/channels/chan_dahdi.c (original)
+++ team/rmudgett/sig_ss7/channels/chan_dahdi.c Wed Jun  2 17:13:57 2010
@@ -5845,7 +5845,8 @@
 
 		revert_fax_buffers(p, ast);
 
-		law = DAHDI_LAW_DEFAULT;
+		p->law = p->law_default;
+		law = p->law_default;
 		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_SETLAW, &law);
 		if (res < 0)
 			ast_log(LOG_WARNING, "Unable to set law on channel %d to default: %s\n", p->channel, strerror(errno));