From d647b4ae022cbce0aaee03e8ba51de013ed0ae80 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Mon, 26 Aug 2013 16:25:39 +0000 Subject: bridging: Fix a livelock with local channel optimization. Use a better means of waking up the bridge channel thread. ........ Merged revisions 397650 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397651 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/bridge_channel.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/asterisk') diff --git a/include/asterisk/bridge_channel.h b/include/asterisk/bridge_channel.h index 149c8e0d1..de67347bb 100644 --- a/include/asterisk/bridge_channel.h +++ b/include/asterisk/bridge_channel.h @@ -144,8 +144,6 @@ struct ast_bridge_channel { AST_LIST_HEAD_NOLOCK(, ast_frame) wr_queue; /*! Pipe to alert thread when frames are put into the wr_queue. */ int alert_pipe[2]; - /*! TRUE if the bridge channel thread is waiting on channels (needs to be atomically settable) */ - int waiting; /*! * \brief The bridge channel thread activity. * -- cgit v1.2.3