[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1324290515-5207-1-git-send-email-igorm@etf.rs>
Date: Mon, 19 Dec 2011 11:28:35 +0100
From: igorm@....rs
To: netdev@...r.kernel.org
Cc: davem@...emloft.net, nic_swsd@...ltek.com, romieu@...zoreil.com,
therbert@...gle.com, eric.dumazet@...il.com,
Igor Maravic <igorm@....rs>
Subject: [PATCH net-next] r8169: Support for byte queue limits
From: Igor Maravic <igorm@....rs>
Changes to r8169 to use byte queue limits.
Signed-off-by: Igor Maravic <igorm@....rs>
---
drivers/net/ethernet/realtek/r8169.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 36b2a4b..5fefcc3 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5326,6 +5326,7 @@ static void rtl8169_tx_clear(struct rtl8169_private *tp)
{
rtl8169_tx_clear_range(tp, tp->dirty_tx, NUM_TX_DESC);
tp->cur_tx = tp->dirty_tx = 0;
+ netdev_reset_queue(tp->dev);
}
static void rtl8169_schedule_work(struct net_device *dev, work_func_t task)
@@ -5535,6 +5536,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
opts[0] |= FirstFrag | LastFrag;
tp->tx_skb[entry].skb = skb;
}
+ netdev_sent_queue(dev, skb->len);
txd->opts2 = cpu_to_le32(opts[1]);
@@ -5624,6 +5626,8 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
void __iomem *ioaddr)
{
unsigned int dirty_tx, tx_left;
+ unsigned int bytes_compl = 0;
+ int tx_compl = 0;
dirty_tx = tp->dirty_tx;
smp_rmb();
@@ -5642,14 +5646,18 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
rtl8169_unmap_tx_skb(&tp->pci_dev->dev, tx_skb,
tp->TxDescArray + entry);
if (status & LastFrag) {
- dev->stats.tx_packets++;
- dev->stats.tx_bytes += tx_skb->skb->len;
+ tx_compl++;
+ bytes_compl += tx_skb->skb->len;
dev_kfree_skb(tx_skb->skb);
tx_skb->skb = NULL;
}
dirty_tx++;
tx_left--;
}
+ dev->stats.tx_packets += tx_compl;
+ dev->stats.tx_bytes += bytes_compl;
+
+ netdev_completed_queue(dev, tx_compl, bytes_compl);
if (tp->dirty_tx != dirty_tx) {
tp->dirty_tx = dirty_tx;
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists