aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2010-02-24 06:00:17 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-26 02:08:34 -0800
commit9c5f9c2861909753140ad6a41cdc77cdf20c1dc9 (patch)
tree0244279540075f960b4afb6927b433db7dee36f7
parentocteon: convert to use netdev_for_each_mc_addr (diff)
downloadlinux-dev-9c5f9c2861909753140ad6a41cdc77cdf20c1dc9.tar.xz
linux-dev-9c5f9c2861909753140ad6a41cdc77cdf20c1dc9.zip
isa-skelton: Remove a wrong netif_wake_queue() call
The netif_wake_queue() is called correctly (i.e. only on !txfull condition) from net_tx(). So Unconditional call to the netif_wake_queue() here is wrong. This might cause calling of start_xmit routine on txfull state and trigger tx-ring overflow. This fix is ported from commit 662a96bd6f020782dfbdc0d0bd177c7dbb556687 ("tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON"). Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/isa-skeleton.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index d09e4d3a15a6..9e55c3007743 100644
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -536,7 +536,6 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
/* Transmit complete. */
net_tx(dev);
np->stats.tx_packets++;
- netif_wake_queue(dev);
}
#endif
if (status & COUNTERS_INTR) {