@@ -532,6 +532,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
#endif
unsigned int work_count = tulip_max_interrupt_work;
unsigned int handled = 0;
+ unsigned int bytes_compl = 0;
/* Let's see whether the interrupt really is for us */
csr5 = ioread32(ioaddr + CSR5);
@@ -634,6 +635,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
PCI_DMA_TODEVICE);
/* Free the original skb. */
+ bytes_compl += tp->tx_buffers[entry].skb->len;
dev_kfree_skb_irq(tp->tx_buffers[entry].skb);
tp->tx_buffers[entry].skb = NULL;
tp->tx_buffers[entry].mapping = 0;
@@ -802,6 +804,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
}
#endif /* CONFIG_TULIP_NAPI */
+ netdev_completed_queue(dev, tx, bytes_compl);
if ((missed = ioread32(ioaddr + CSR8) & 0x1ffff)) {
dev->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
}
@@ -703,6 +703,7 @@ tulip_start_xmit(struct sk_buff *skb, struct net_device *dev)
wmb();
tp->cur_tx++;
+ netdev_sent_queue(dev, skb->len);
/* Trigger an immediate transmit demand. */
iowrite32(0, tp->base_addr + CSR1);
@@ -746,6 +747,7 @@ static void tulip_clean_tx_ring(struct tulip_private *tp)
tp->tx_buffers[entry].skb = NULL;
tp->tx_buffers[entry].mapping = 0;
}
+ netdev_reset_queue(tp->dev);
}
static void tulip_down (struct net_device *dev)
Changes to tulip to use byte queue limits. Nearly the same patch which was already sent by George Spelvin to the netdev list, see here: http://thread.gmane.org/gmane.linux.network/276166 Maybe George could re-test it and give it an ACK/NACK? This patch _was not_ tested on real hardware by me. But I have such card in an ADSL Linux Router, which may be updated some time and then I would like to use codel with it :) Original-Patch-By: George Spelvin <linux@horizon.com> Signed-off-by: Tino Reichardt <milky-kernel@mcmilk.de> --- drivers/net/ethernet/dec/tulip/interrupt.c | 3 +++ drivers/net/ethernet/dec/tulip/tulip_core.c | 2 ++ 2 files changed, 5 insertions(+)