summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2009-12-11 23:22:32 +0000
committerShaun Ruffell <sruffell@digium.com>2009-12-11 23:22:32 +0000
commit323d34b88b9d2b86d5e8dc0abe1b29e4ffb77fc5 (patch)
tree85cc702e8df582f178c07e38812732ed8316d186
parent5aac27e4891af7edd7132a8f5461ec9ddeb0acab (diff)
Merged revisions 7682 via svnmerge from
https://origsvn.digium.com/svn/dahdi/linux/trunk ........ r7682 | sruffell | 2009-12-11 17:20:03 -0600 (Fri, 11 Dec 2009) | 5 lines dahdi-base: Do not wait for impulse when echotraining. Waiting here for the impulse on the transmit can cause the echotraining logic to stick the channel into muted state. This is especially apparent on systems that regularly do not service the interrupts every millisecond. DAHDI-387. ........ git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@7684 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/dahdi-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 478bd64..192e03e 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -6764,7 +6764,7 @@ static inline void __dahdi_ec_chunk(struct dahdi_chan *ss, unsigned char *rxchun
ss->ec_state->status.mode = ECHO_MODE_STARTTRAINING;
}
}
- if ((ss->ec_state->status.mode == ECHO_MODE_AWAITINGECHO) && (txlin > 8000)) {
+ if (ss->ec_state->status.mode == ECHO_MODE_AWAITINGECHO) {
ss->ec_state->status.last_train_tap = 0;
ss->ec_state->status.mode = ECHO_MODE_TRAINING;
}