diff options
author | Jason Parker <jparker@digium.com> | 2008-07-23 21:50:20 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2008-07-23 21:50:20 +0000 |
commit | fabba06d0271b0907903f946100690fdacee4f1d (patch) | |
tree | f3eba7a54c8fc5d20d1c252190d2db6d2931c94e | |
parent | aa9e4147fef51ad31f2189770509a7735ab83cae (diff) |
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
-rw-r--r-- | channels/chan_dahdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 3884a4f23..9b10fa131 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) |