diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2012-04-03 22:02:20 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2012-04-03 22:02:20 +0000 |
| commit | 054c04e5fc9d6349870b11c5129f26de1c14c0be (patch) | |
| tree | 377431c4630500ea891195ba0c2b2475e34efa1e | |
| parent | 8d662842f34a77d0283574744d9c4d4ee19c4334 (diff) | |
dahdi: Fix compilation when CONFIG_DAHDI_ECHOCAN_PROCESS_TX is defined.
'ec_state' was renamed to 'dahdi_echocan_state' in r6529 [1] but support for
CONFIG_DAHDI_ECHOCAN_PROCESS_TX was first committed in r9442 [2]. So it
appears that I never compiled tested this exact commit when it went in for the
2.5.0 release.
[1] http://svnview.digium.com/svn/dahdi?view=revision&revision=6529
[2] http://svnview.digium.com/svn/dahdi?view=revision&revision=9442
Reported-by: Pavel Selivanov
Internal-Issue-ID: DAHLIN-279
Patches: ec.patch uploaded by Pavel Selivanov (License #5420)
[ edited the patch slightly for minor formatting ]
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10633
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.5@10635 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 958ee39..2e83b2c 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -2400,12 +2400,11 @@ static ssize_t dahdi_chan_write(struct file *file, const char __user *usrbuf, if ((chan->ec_state) && (ECHO_MODE_ACTIVE == chan->ec_state->status.mode) && (chan->ec_state->ops->echocan_process_tx)) { - struct ec_state *const ec_state = chan->ec_state; + struct dahdi_echocan_state *const ec = chan->ec_state; for (x = 0; x < chan->writen[res]; ++x) { short tx; tx = DAHDI_XLAW(chan->writebuf[res][x], chan); - ec_state->ops->echocan_process_tx(ec_state, - &tx, 1); + ec->ops->echocan_process_tx(ec, &tx, 1); chan->writebuf[res][x] = DAHDI_LIN2X((int) tx, chan); } |