Commit eaff9453 authored by Krzysztof Halasa's avatar Krzysztof Halasa Committed by David S. Miller

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

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: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f544961
...@@ -293,6 +293,7 @@ static inline void sca_tx_done(port_t *port) ...@@ -293,6 +293,7 @@ static inline void sca_tx_done(port_t *port)
struct net_device *dev = port->netdev; struct net_device *dev = port->netdev;
card_t* card = port->card; card_t* card = port->card;
u8 stat; u8 stat;
unsigned count = 0;
spin_lock(&port->lock); spin_lock(&port->lock);
...@@ -316,10 +317,12 @@ static inline void sca_tx_done(port_t *port) ...@@ -316,10 +317,12 @@ static inline void sca_tx_done(port_t *port)
dev->stats.tx_bytes += readw(&desc->len); dev->stats.tx_bytes += readw(&desc->len);
} }
writeb(0, &desc->stat); /* Free descriptor */ writeb(0, &desc->stat); /* Free descriptor */
count++;
port->txlast = (port->txlast + 1) % card->tx_ring_buffers; port->txlast = (port->txlast + 1) % card->tx_ring_buffers;
} }
netif_wake_queue(dev); if (count)
netif_wake_queue(dev);
spin_unlock(&port->lock); spin_unlock(&port->lock);
} }
......
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