diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-30 00:40:10 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-30 00:40:10 +0000 |
| commit | 0b499612bd87f5c11ea3618892724ecbf58a7746 (patch) | |
| tree | 234d7f89acb882418de0da7498286c80ddb3d46b | |
| parent | de16d074a41c5d4949cbe2433d36d3295090a180 (diff) | |
Merged revisions 293339 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r293339 | rmudgett | 2010-10-29 19:34:12 -0500 (Fri, 29 Oct 2010) | 1 line
Remove some code that serves no purpose.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@293340 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 2ac06305d..70dbc687d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -6590,17 +6590,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) /* Lets see what we're up to */ if (((ast->pbx) || (ast->_state == AST_STATE_UP)) && (p->transfertobusy || (ast->_state != AST_STATE_BUSY))) { - struct ast_channel *other = ast_bridged_channel(p->subs[SUB_THREEWAY].owner); - int way3bridge = 0, cdr3way = 0; - - if (!other) { - other = ast_bridged_channel(p->subs[SUB_REAL].owner); - } else - way3bridge = 1; - - if (p->subs[SUB_THREEWAY].owner->cdr) - cdr3way = 1; - ast_verb(3, "Building conference on call on %s and %s\n", p->subs[SUB_THREEWAY].owner->name, p->subs[SUB_REAL].owner->name); /* Put them in the threeway, and flip */ p->subs[SUB_THREEWAY].inthreeway = 1; |