diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-08-26 16:25:39 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-08-26 16:25:39 +0000 |
| commit | d647b4ae022cbce0aaee03e8ba51de013ed0ae80 (patch) | |
| tree | 19afb2e476cd066099c8627d1137431c5b218973 /include/asterisk/bridge_channel.h | |
| parent | 13dbdd1ae729002fa07c63d35cbea3967cf43cd1 (diff) | |
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
Diffstat (limited to 'include/asterisk/bridge_channel.h')
| -rw-r--r-- | include/asterisk/bridge_channel.h | 2 |
1 files changed, 0 insertions, 2 deletions
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. * |