From 38189866bfeda21a39fa7fbc47cf150bef6002bd Mon Sep 17 00:00:00 2001 From: David Vossel Date: Mon, 21 Sep 2009 17:01:11 +0000 Subject: [PATCH] Merged revisions 219721 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r219721 | dvossel | 2009-09-21 11:59:05 -0500 (Mon, 21 Sep 2009) | 9 lines Merged revisions 219720 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r219720 | dvossel | 2009-09-21 11:55:53 -0500 (Mon, 21 Sep 2009) | 3 lines Reverting merge 219520. This change was not necessary. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@219722 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index d09e46bafc..442afef4bb 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1640,7 +1640,6 @@ static void iax2_destroy_helper(struct chan_iax2_pvt *pvt) static void iax2_frame_free(struct iax_frame *fr) { ast_sched_thread_del(sched, fr->retrans); - fr->retrans = -1; iax_frame_free(fr); } @@ -3312,6 +3311,7 @@ static void __attempt_transmit(const void *data) AST_LIST_LOCK(&frame_queue); AST_LIST_REMOVE(&frame_queue, f, list); AST_LIST_UNLOCK(&frame_queue); + f->retrans = -1; /* this is safe because this is the scheduled function */ /* Free the IAX frame */ iax2_frame_free(f); }