[svn-commits] mattf: linux/trunk r4582 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Wed Jul  9 01:34:56 2008
New Revision: 4582

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4582
Log:
Revert optimization done in rev 4436 which broke the MTP2 signalling type.

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=4582&r1=4581&r2=4582
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Wed Jul  9 01:34:56 2008
@@ -6801,15 +6801,20 @@
 					 * have messed around with it since then */
 
 					int comparemessage;
+					/* Shut compiler up */
+					int myres = 0;
 
 					if (ms->flags & DAHDI_FLAG_MTP2) {
 						comparemessage = (ms->inreadbuf - 1) & (ms->numbufs - 1);
-						if (!memcmp(ms->readbuf[comparemessage], ms->readbuf[ms->inreadbuf], ms->readn[ms->inreadbuf])) {
-							/* Our messages are the same, so discard -
-							 * 	Don't advance buffers, reset indexes and buffer sizes. */
-							ms->readn[ms->inreadbuf] = 0;
-							ms->readidx[ms->inreadbuf] = 0;
-						}
+
+						myres = memcmp(ms->readbuf[comparemessage], ms->readbuf[ms->inreadbuf], ms->readn[ms->inreadbuf]);
+					}
+
+					if ((ms->flags & DAHDI_FLAG_MTP2) && !myres) {
+						/* Our messages are the same, so discard -
+						 * 	Don't advance buffers, reset indexes and buffer sizes. */
+						ms->readn[ms->inreadbuf] = 0;
+						ms->readidx[ms->inreadbuf] = 0;
 					} else {
 						ms->inreadbuf = (ms->inreadbuf + 1) % ms->numbufs;
 						if (ms->inreadbuf == ms->outreadbuf) {