summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorhtbegin2012-10-01 18:42:43 +0200
committerDavid S. Miller2012-10-03 04:34:21 +0200
commitffb5ba90017505a19e238e986e6d33f09e4df765 (patch)
treee73f8aae99d744457684be88e507704342a2424b /drivers/net
parentpch_gbe: Fix PTP dependencies. (diff)
downloadkernel-qcow2-linux-ffb5ba90017505a19e238e986e6d33f09e4df765.tar.gz
kernel-qcow2-linux-ffb5ba90017505a19e238e986e6d33f09e4df765.tar.xz
kernel-qcow2-linux-ffb5ba90017505a19e238e986e6d33f09e4df765.zip
net: ethernet: davinci_cpdma: decrease the desc count when cleaning up the remaining packets
chan->count is used by rx channel. If the desc count is not updated by the clean up loop in cpdma_chan_stop, the value written to the rxfree register in cpdma_chan_start will be incorrect. Signed-off-by: Tao Hou <hotforest@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/ti/davinci_cpdma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index d15c888e9df8..49956730cd8d 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -863,6 +863,7 @@ int cpdma_chan_stop(struct cpdma_chan *chan)
next_dma = desc_read(desc, hw_next);
chan->head = desc_from_phys(pool, next_dma);
+ chan->count--;
chan->stats.teardown_dequeue++;
/* issue callback without locks held */