diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-08-10 19:22:01 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-08-10 19:22:01 +0000 |
| commit | c7a6466db46c26a22e35dec5261a32fc4a9c73d7 (patch) | |
| tree | 4dc0a98d306aa7e1c44a0315c0092d5349e0671c /drivers/dahdi/dahdi_dynamic.c | |
| parent | 1c33faadcd7aaef1deb2af77d1a120d6dbe2fc3a (diff) | |
dahdi_dynamic: Call dahdi_receive in rx packet handler.
Currently dahdi_receive is called on all channels in the context of the
master dynamic span. If one span (not the master) receive two packets
before the master span received a packet, the older packet on the
dynamic span would end up lost because the "readchunk" for the
channels would be overwritten by the new packet. DAHLIN-245
Signed-off-by: Wagner Gegler <wagner@aligera.com.br> (License #6268)
Changed dahdi_ec_chunk to dahdi_ec_span.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10110 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi_dynamic.c')
| -rw-r--r-- | drivers/dahdi/dahdi_dynamic.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index fd41676..20d7246 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -200,16 +200,9 @@ static void __dahdi_dynamic_run(void) { struct dahdi_dynamic *d; struct dahdi_dynamic_driver *drv; - int y; rcu_read_lock(); list_for_each_entry_rcu(d, &dspan_list, list) { - for (y = 0; y < d->span.channels; y++) { - struct dahdi_chan *const c = d->span.chans[y]; - /* Echo cancel double buffered data */ - dahdi_ec_chunk(c, c->readchunk, c->writechunk); - } - dahdi_receive(&d->span); dahdi_transmit(&d->span); /* Handle all transmissions now */ dahdi_dynamic_sendmessage(d); @@ -370,6 +363,9 @@ void dahdi_dynamic_receive(struct dahdi_span *span, unsigned char *msg, int msgl if (unlikely(rxpos != rxcnt)) printk(KERN_NOTICE "Span %s: Expected seq no %d, but received %d instead\n", span->name, rxcnt, rxpos); + dahdi_ec_span(span); + dahdi_receive(span); + /* If this is our master span, then run everything */ if (master) dahdi_dynamic_run(); |