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

dahdi: Only check for NOSTDTXRX once in dahdi_receive.

Browse Source 
There is no need to check the flag on the master channel when processing all
the slave channels.  Originally part of a patch kpfleming had floating around.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Kevin P. Fleming <kpfleming@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9602 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2011-01-03 18:27:44 +00:00
parent 9d4a2fad78
commit 7c49f372c2
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8849,8 +8849,12 @@ int dahdi_receive(struct dahdi_span *span)
for (x = 0; x < span->channels; x++) {
struct dahdi_chan *const chan = span->chans[x];
spin_lock(&chan->lock);
if (unlikely(chan->flags & DAHDI_FLAG_NOSTDTXRX)) {
spin_unlock(&chan->lock);
continue;
}
if (chan->master == chan) {
spin_lock(&chan->lock);
if (chan->nextslave) {
/* Must process each slave at the same time */
u_char data[DAHDI_CHUNKSIZE];
@@ -8862,16 +8866,14 @@ int dahdi_receive(struct dahdi_span *span)
for (z = chan; z; z = z->nextslave) {
data[pos++] = z->readchunk[y];
if (pos == DAHDI_CHUNKSIZE) {
if (!(chan->flags & DAHDI_FLAG_NOSTDTXRX))
__dahdi_receive_chunk(chan, data);
__dahdi_receive_chunk(chan, data);
pos = 0;
}
}
}
} else {
/* Process a normal channel */
if (!(chan->flags & DAHDI_FLAG_NOSTDTXRX))
__dahdi_real_receive(chan);
__dahdi_real_receive(chan);
}
if (chan->itimer) {
chan->itimer -= DAHDI_CHUNKSIZE;
@@ -8916,8 +8918,8 @@ int dahdi_receive(struct dahdi_span *span)
#ifdef BUFFER_DEBUG
chan->statcount -= DAHDI_CHUNKSIZE;
#endif
spin_unlock(&chan->lock);
}
spin_unlock(&chan->lock);
}
local_irq_restore(flags);