kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-17 13:09:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 219720 via svnmerge from

Browse Source 
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/trunk@219721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-09-21 16:59:05 +00:00
parent 07f9778f5b
commit 9329079bb4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+1 -1
View File
@@ -1685,7 +1685,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);
}
@@ -3353,6 +3352,7 @@ static void __attempt_transmit(const void *data)
/* Don't attempt delivery, just remove it from the queue */
AST_LIST_REMOVE(&frame_queue[callno], f, list);
ast_mutex_unlock(&iaxsl[callno]);
f->retrans = -1; /* this is safe because this is the scheduled function */
/* Free the IAX frame */
iax2_frame_free(f);
} else if (callno) {