[svn-commits] mattf: branch 1.6.0 r121915 - in /branches/1.6.0: ./ channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Wed Jun 11 13:57:15 2008
New Revision: 121915

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121915
Log:
Merged revisions 121914 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r121914 | mattf | 2008-06-11 13:53:10 -0500 (Wed, 11 Jun 2008) | 1 line

Fix pseudo channel allocation errors on startup when using SS7
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=121915&r1=121914&r2=121915
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Wed Jun 11 13:57:15 2008
@@ -8160,7 +8160,7 @@
 				}
 			}
 #ifdef HAVE_SS7
-			if (conf->chan.sig == SIG_SS7) {
+			if (chan_sig == SIG_SS7) {
 				struct zt_ss7 *ss7;
 				int clear = 0;
 				if (ioctl(tmp->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &clear)) {