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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@293417 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 70dbc687dd417b979868ccf872791d60c2dd1da8..79078e7a69de42eddb4fc2569452a6e3cf6e43d3 100644 (file)
--- 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 */