aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_dahdi.c
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-30 01:49:15 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-30 01:49:15 +0000
commitca1e524b7660ce141452e514837eec0d7595ee76 (patch)
tree3d6124ac447fc7836480b6fa41ffb56647e5d08f /channels/chan_dahdi.c
parent0b499612bd87f5c11ea3618892724ecbf58a7746 (diff)
Merged revisions 293416 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r293416 | rmudgett | 2010-10-29 20:45:49 -0500 (Fri, 29 Oct 2010) | 1 line Remove some more code that serves no purpose. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@293417 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
-rw-r--r--channels/chan_dahdi.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 70dbc687d..79078e7a6 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -6533,17 +6533,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
dahdi_enable_ec(p);
ast_hangup(chan);
} else {
- 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, "Started three way call on channel %d\n", p->channel);
/* Start music on hold if appropriate */