diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 21:50:57 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 21:50:57 +0000 |
| commit | b80fecce27cedcbfa96cf628c86e1ac2a909caa1 (patch) | |
| tree | 2ca191b668ca3aa18d09bef7d40b5a39f7384138 /channels | |
| parent | a5d2b5626b1162323d8e0a045448f6a82215a8d2 (diff) | |
Merged revisions 133296 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r133296 | qwell | 2008-07-23 16:50:20 -0500 (Wed, 23 Jul 2008) | 9 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@133297 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 4ffdd02f4..e16a37601 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8304,7 +8304,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)); @@ -11335,7 +11335,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) |