aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authormattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-11 18:57:15 +0000
committermattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-11 18:57:15 +0000
commit44e21491ee5bbd71512f0e14e4d0aba462e12639 (patch)
treec7f434034c194f784ad36b7f932afeee2186975b /channels/chan_zap.c
parenta1e5e9b6643a99df9ebf2c17b6c9d00d506e53c8 (diff)
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 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@121915 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r--channels/chan_zap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 289993b2c..f8ca9aa15 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -8160,7 +8160,7 @@ static struct zt_pvt *mkintf(int channel, const struct zt_chan_conf *conf, struc
}
}
#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)) {