From: Dale Farnsworth <dale@farnsworth.org>
Date: Wed, 12 Apr 2006 01:24:26 +0000 (-0700)
Subject: [PATCH] mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue
X-Git-Tag: v2.6.17-rc2~81^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94843566d7119e049a72618a3c939d5c2be022c7;p=pandora-kernel.git

[PATCH] mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue

After resetting the hardware on a tx_timeout, call netif_wake_queue()
only if we have free tx descriptors.

Also, attempt to recover if mv643xx_eth_start_xmit() is called when
there are fewer free tx descriptors than expected.

The BUG_ON() call we are replacing was hit on a tx_timeout that
called netif_wake_queue(), indirectly via netif_device_attach(),
even though we did not have enough free tx descriptors.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

Reading git-diff-tree failed