aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-16 21:20:08 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-16 21:20:08 +0000
commit7df586dff8bba81c7dedddaecc7e798009053e7b (patch)
treea32bcc106c53171c417757c1191846eb4a49224b /channels/chan_zap.c
parent3a97dfcd429edf447a8fb175a91475014d7ab062 (diff)
Fix some variables that were forgotten to be renamed, related to 117658. Couldn't merge from trunk since the chan_dahdi transition has not occurred here yet
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123178 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r--channels/chan_zap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f8ca9aa15..81747e193 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -8143,8 +8143,8 @@ static struct zt_pvt *mkintf(int channel, const struct zt_chan_conf *conf, struc
}
if (conf->is_sig_auto)
chan_sig = sigtype_to_signalling(p.sigtype);
- if (p.sigtype != (conf->chan.sig & 0x3ffff)) {
- ast_log(LOG_ERROR, "Signalling requested on channel %d is %s but line is in %s signalling\n", channel, sig2str(conf->chan.sig), sig2str(p.sigtype));
+ if (p.sigtype != (chan_sig & 0x3ffff)) {
+ ast_log(LOG_ERROR, "Signalling requested on channel %d is %s but line is in %s signalling\n", channel, sig2str(chan_sig), sig2str(p.sigtype));
destroy_zt_pvt(&tmp);
return NULL;
}