git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 347ed54cf912b1b30b0690e7ecf4d55f57e52a5d Mon Sep 17 00:00:00 2001
   2 From: htbegin <hotforest@gmail.com>
   3 Date: Mon, 1 Oct 2012 16:42:43 +0000
   4 Subject: net: ethernet: davinci_cpdma: decrease the desc count when cleaning up the remaining packets
   5
   6
   7 From: htbegin <hotforest@gmail.com>
   8
   9 [ Upstream commit ffb5ba90017505a19e238e986e6d33f09e4df765 ]
  10
  11 chan->count is used by rx channel. If the desc count is not updated by
  12 the clean up loop in cpdma_chan_stop, the value written to the rxfree
  13 register in cpdma_chan_start will be incorrect.
  14
  15 Signed-off-by: Tao Hou <hotforest@gmail.com>
  16 Signed-off-by: David S. Miller <davem@davemloft.net>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18 ---
  19  drivers/net/davinci_cpdma.c |    1 +
  20  1 file changed, 1 insertion(+)
  21
  22 --- a/drivers/net/davinci_cpdma.c
  23 +++ b/drivers/net/davinci_cpdma.c
  24 @@ -849,6 +849,7 @@ int cpdma_chan_stop(struct cpdma_chan *c
  25
  26                 next_dma = desc_read(desc, hw_next);
  27                 chan->head = desc_from_phys(pool, next_dma);
  28 +               chan->count--;
  29                 chan->stats.teardown_dequeue++;
  30
  31                 /* issue callback without locks held */