Commit ccc57aac authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Jeff Garzik

tc35815: Fix receiver hangup on Rx FIFO overflow

On Rx FIFO overflow error, the controller consume a buffer descriptor
but currently the driver does not give it back to the controller.
This results unrecoverable 'Buffer List Exhausted' condition.  This
patch fix this problem by moving a "fbl_count--" line to proper place.
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 59524a37
...@@ -1736,7 +1736,6 @@ tc35815_rx(struct net_device *dev) ...@@ -1736,7 +1736,6 @@ tc35815_rx(struct net_device *dev)
skb = lp->rx_skbs[cur_bd].skb; skb = lp->rx_skbs[cur_bd].skb;
prefetch(skb->data); prefetch(skb->data);
lp->rx_skbs[cur_bd].skb = NULL; lp->rx_skbs[cur_bd].skb = NULL;
lp->fbl_count--;
pci_unmap_single(lp->pci_dev, pci_unmap_single(lp->pci_dev,
lp->rx_skbs[cur_bd].skb_dma, lp->rx_skbs[cur_bd].skb_dma,
RX_BUF_SIZE, PCI_DMA_FROMDEVICE); RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
...@@ -1792,6 +1791,7 @@ tc35815_rx(struct net_device *dev) ...@@ -1792,6 +1791,7 @@ tc35815_rx(struct net_device *dev)
#ifdef TC35815_USE_PACKEDBUFFER #ifdef TC35815_USE_PACKEDBUFFER
while (lp->fbl_curid != id) while (lp->fbl_curid != id)
#else #else
lp->fbl_count--;
while (lp->fbl_count < RX_BUF_NUM) while (lp->fbl_count < RX_BUF_NUM)
#endif #endif
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment