[svn-commits] sruffell: branch linux/2.2 r7684 - in /linux/branches/2.2: ./ drivers/dahdi/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Dec 11 17:22:32 2009
New Revision: 7684

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7684
Log:
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.
........

Modified:
    linux/branches/2.2/   (props changed)
    linux/branches/2.2/drivers/dahdi/dahdi-base.c

Propchange: linux/branches/2.2/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: linux/branches/2.2/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/dahdi-base.c?view=diff&rev=7684&r1=7683&r2=7684
==============================================================================
--- linux/branches/2.2/drivers/dahdi/dahdi-base.c (original)
+++ linux/branches/2.2/drivers/dahdi/dahdi-base.c Fri Dec 11 17:22:32 2009
@@ -6764,7 +6764,7 @@
 						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;
 				}