automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@22899 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 32ceb1e04532d197fdee6be27edc6d6630122f04..b7fe976632ac046a9bc8f823d6554fe66a60f36a 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -9030,7 +9030,7 @@ static void *pri_dchannel(void *vpri)
                                        ast_log(LOG_WARNING, "Received SETUP_ACKNOWLEDGE on unconfigured channel %d/%d span %d\n", 
                                                PRI_SPAN(e->setup_ack.channel), PRI_CHANNEL(e->setup_ack.channel), pri->span);
                                } else {
-                                       chanpos = pri_fixup_principle(pri, chanpos, e->ring.call);
+                                       chanpos = pri_fixup_principle(pri, chanpos, e->setup_ack.call);
                                        if (chanpos > -1) {
                                                ast_mutex_lock(&pri->pvts[chanpos]->lock);
                                                pri->pvts[chanpos]->setup_ack = 1;