Revert part of issue #5620 (revision 6965) as it appears that it was in error.

This should fix talk call progress on analog lines.
(closes issue #12178)
 Reported by: michael-fig
 Patches:
       20080717__bug12178.diff.txt uploaded by Corydon76 (license 14)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@131790 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 73d528c2a0205cfba3db83bb08fe3a8fc07d2254..8eb8fd474a3431fa74f718de70f195d7eb0e161a 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -5321,12 +5321,13 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb
                        else
                                i->dsp = NULL;
                        if (i->dsp) {
-                               i->dsp_features = features & ~DSP_PROGRESS_TALK;
+                               i->dsp_features = features;
 #ifdef HAVE_PRI
                                /* We cannot do progress detection until receives PROGRESS message */
                                if (i->outgoing && (i->sig == SIG_PRI)) {
                                        /* Remember requested DSP features, don't treat
                                           talking as ANSWER */
+                                       i->dsp_features = features & ~DSP_PROGRESS_TALK;
                                        features = 0;
                                }
 #endif