From 2f880acd101f90e3aeff8a3509ee07902da35329 Mon Sep 17 00:00:00 2001 From: Wagner Gegler Date: Thu, 11 Aug 2011 19:56:18 +0000 Subject: [PATCH] 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 (License #6268) Changed dahdi_ec_chunk to dahdi_ec_span. Signed-off-by: Shaun Ruffell Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10110 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.5@10116 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/dahdi_dynamic.c | 10 +++------- 1 file 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();