Merged revisions 190946 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r190946 | mattf | 2009-04-28 17:05:05 -0500 (Tue, 28 Apr 2009) | 1 line

Make sure that we do not clear the down flag on the BRI during PTMP link transients.  Also refix SS7 audio that the early media patch broke.
........


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

channels/chan_dahdi.c

@@ -11425,6 +11425,7 @@ static void *ss7_linkset(void *data)
 						ast_debug(1, "Queuing frame PROGRESS on CIC %d\n", p->cic);
 						dahdi_queue_frame(p, &f, linkset);
 						p->progress = 1;
+						p->dialing = 0;
 						if (p->dsp && p->dsp_features) {
 							ast_dsp_set_features(p->dsp, p->dsp_features);
 							p->dsp_features = 0;
@@ -11655,6 +11656,7 @@ static void *ss7_linkset(void *data)
 					ast_mutex_lock(&p->lock);
 					dahdi_queue_frame(p, &f, linkset);
 					p->proceeding = 1;
+					p->dialing = 0;
 					/* Send alerting if subscriber is free */
 					if (e->acm.called_party_status_ind == 1) {
 						p->alerting = 1;
@@ -12509,7 +12511,7 @@ static void *pri_dchannel(void *vpri)
 					ast_verb(2, "%s D-Channel on span %d up\n", pri_order(which), pri->span);
 				}
 				pri->dchanavail[which] |= DCHAN_UP;
-			} else {
+			} else if (pri->sig != SIG_BRI_PTMP) {
 				if (pri->dchanavail[which] & DCHAN_UP) {
 					ast_verb(2, "%s D-Channel on span %d down\n", pri_order(which), pri->span);
 				}