diff mbox

WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.

Message ID m37hfe7iiw.fsf@intrepid.localdomain
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Krzysztof Halasa Dec. 12, 2010, 10:06 p.m. UTC
We must not wake the TX queue without free TX descriptors.
sca_xmit() expects at least one free descriptor and BUGs otherwise.

Problem reported and fix tested by Bernie Innocenti and Ward Vandewege.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Dec. 12, 2010, 11:03 p.m. UTC | #1
From: Krzysztof Halasa <khc@pm.waw.pl>
Date: Sun, 12 Dec 2010 23:06:47 +0100

> We must not wake the TX queue without free TX descriptors.
> sca_xmit() expects at least one free descriptor and BUGs otherwise.
> 
> Problem reported and fix tested by Bernie Innocenti and Ward Vandewege.
> 
> Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -293,6 +293,7 @@  static inline void sca_tx_done(port_t *port)
 	struct net_device *dev = port->netdev;
 	card_t* card = port->card;
 	u8 stat;
+	unsigned count = 0;
 
 	spin_lock(&port->lock);
 
@@ -316,10 +317,12 @@  static inline void sca_tx_done(port_t *port)
 			dev->stats.tx_bytes += readw(&desc->len);
 		}
 		writeb(0, &desc->stat);	/* Free descriptor */
+		count++;
 		port->txlast = (port->txlast + 1) % card->tx_ring_buffers;
 	}
 
-	netif_wake_queue(dev);
+	if (count)
+		netif_wake_queue(dev);
 	spin_unlock(&port->lock);
 }