diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-17 18:28:56 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-17 18:28:56 +0000 |
| commit | 0471eb65b0e53669f29fa930acd89791f67c5079 (patch) | |
| tree | 458d15d2877d30479aa7f1ad7a1d7361e4520334 /channels/chan_dahdi.c | |
| parent | 38fd67824b8fe1d8205f45fd6db386a14caeb206 (diff) | |
Merged revisions 123238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r123238 | jpeeler | 2008-06-16 18:05:18 -0500 (Mon, 16 Jun 2008) | 1 line
Fix some (more) variables that were forgotten to be renamed, related to 117658
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123387 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d923fc4d7..81f087e0d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8273,7 +8273,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, return NULL; } - pris[span].sig = conf->chan.sig; + pris[span].sig = chan_sig; pris[span].nodetype = conf->pri.nodetype; pris[span].switchtype = myswitchtype; pris[span].nsf = conf->pri.nsf; @@ -8392,7 +8392,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, #endif tmp->immediate = conf->chan.immediate; tmp->transfertobusy = conf->chan.transfertobusy; - if (conf->chan.sig & __DAHDI_SIG_FXS) { + if (chan_sig & __DAHDI_SIG_FXS) { tmp->mwimonitor_fsk = conf->chan.mwimonitor_fsk; tmp->mwimonitor_neon = conf->chan.mwimonitor_neon; } @@ -8547,7 +8547,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, tmp->sendcalleridafter = conf->chan.sendcalleridafter; if (!here) { tmp->locallyblocked = tmp->remotelyblocked = 0; - if ((conf->chan.sig == SIG_PRI) || (conf->chan.sig == SIG_BRI) || (conf->chan.sig == SIG_BRI_PTMP) || (conf->chan.sig == SIG_SS7)) + if ((chan_sig == SIG_PRI) || (chan_sig == SIG_BRI) || (chan_sig == SIG_BRI_PTMP) || (chan_sig == SIG_SS7)) tmp->inservice = 0; else /* We default to in service on protocols that don't have a reset */ tmp->inservice = 1; |