FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Fix compilation when CONFIG_DAHDI_ECHOCAN_PROCESS_TX is defined.

Browse Source 
'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.6@10636 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2012-04-03 22:02:26 +00:00
parent 0ecf2c67c8
commit 6384cb034a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/dahdi/dahdi-base.c
View File

@ -2463,12 +2463,11 @@ static ssize_t dahdi_chan_write(struct file *file, const char __user *usrbuf,
if ((chan->ec_state) && if ((chan->ec_state) &&
(ECHO_MODE_ACTIVE == chan->ec_state->status.mode) && (ECHO_MODE_ACTIVE == chan->ec_state->status.mode) &&
(chan->ec_state->ops->echocan_process_tx)) { (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) { for (x = 0; x < chan->writen[res]; ++x) {
short tx; short tx;
tx = DAHDI_XLAW(chan->writebuf[res][x], chan); tx = DAHDI_XLAW(chan->writebuf[res][x], chan);
ec_state->ops->echocan_process_tx(ec_state, ec->ops->echocan_process_tx(ec, &tx, 1);
&tx, 1);
chan->writebuf[res][x] = DAHDI_LIN2X((int) tx, chan->writebuf[res][x] = DAHDI_LIN2X((int) tx,
chan); chan);
} }