From: Jason Parker <jparker@digium.com>
Date: Wed, 23 Jul 2008 21:50:20 +0000 (+0000)
Subject: Merged revisions 133295 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~1599
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fabba06d0271b0907903f946100690fdacee4f1d;p=thirdparty%2Fasterisk.git

Merged revisions 133295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133295 | qwell | 2008-07-23 16:49:03 -0500 (Wed, 23 Jul 2008) | 1 line

inbandrelease is gone - it's now inbanddisconnect
........


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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 3884a4f238..9b10fa131d 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -8462,7 +8462,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
 						pris[span].minidle = conf->pri.minidle;
 						pris[span].overlapdial = conf->pri.overlapdial;
 #ifdef HAVE_PRI_INBANDDISCONNECT
-						pris[span].inbanddisconnect = conf->pri.inbandrelease;
+						pris[span].inbanddisconnect = conf->pri.inbanddisconnect;
 #endif
 						pris[span].facilityenable = conf->pri.facilityenable;
 						ast_copy_string(pris[span].idledial, conf->pri.idledial, sizeof(pris[span].idledial));
@@ -11491,7 +11491,7 @@ static int start_pri(struct dahdi_pri *pri)
 			pri->overlapdial |= DAHDI_OVERLAPDIAL_BOTH;
 		pri_set_overlapdial(pri->dchans[i],(pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)?1:0);
 #ifdef HAVE_PRI_INBANDDISCONNECT
-		pri_set_inbanddisconnect(pri->dchans[i], pri->inbandrelease);
+		pri_set_inbanddisconnect(pri->dchans[i], pri->inbanddisconnect);
 #endif
 		/* Enslave to master if appropriate */
 		if (i)