diff options
| author | htbegin <hotforest@gmail.com> | 2012-10-01 12:42:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-02 22:34:21 -0400 |
| commit | ffb5ba90017505a19e238e986e6d33f09e4df765 (patch) | |
| tree | e73f8aae99d744457684be88e507704342a2424b /drivers/net | |
| parent | da1586461e53a4dd045738cce309ab488970f0ef (diff) | |
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.c | 1 |
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) | |||
| 863 | 863 | ||
| 864 | next_dma = desc_read(desc, hw_next); | 864 | next_dma = desc_read(desc, hw_next); |
| 865 | chan->head = desc_from_phys(pool, next_dma); | 865 | chan->head = desc_from_phys(pool, next_dma); |
| 866 | chan->count--; | ||
| 866 | chan->stats.teardown_dequeue++; | 867 | chan->stats.teardown_dequeue++; |
| 867 | 868 | ||
| 868 | /* issue callback without locks held */ | 869 | /* issue callback without locks held */ |