Index: channels/chan_dahdi.c
===================================================================
--- channels/chan_dahdi.c	(revision 313097)
+++ channels/chan_dahdi.c	(working copy)
@@ -10368,6 +10368,12 @@
 						}
 						if (i & DAHDI_IOMUX_SIGEVENT) {
 							res = dahdi_get_event(p->subs[idx].dfd);
+							/* Ignore ring before end of cid 'slot' (955ms = 7640 @ 8K samples/sec) */
+							if (res == 2 && samples < 7640)
+								ast_log(LOG_NOTICE, "Ignoring event %d (%s) due to waiting for CID, samples=%d\n", res, event2str(res), samples);
+							else
+							{
+
 							ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res));
 							if (res == DAHDI_EVENT_NOALARM) {
 								p->inalarm = 0;
@@ -10382,6 +10388,7 @@
 								res = 0;
 								break;
 							}
+							}
 						} else if (i & DAHDI_IOMUX_READ) {
 							res = read(p->subs[idx].dfd, buf, sizeof(buf));
 							if (res < 0) {