From: igorm@etf.rs
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, nic_swsd@realtek.com, romieu@fr.zoreil.com,
therbert@google.com, eric.dumazet@gmail.com,
Igor Maravic <igorm@etf.rs>
Subject: [PATCH net-next] r8169: Support for byte queue limits
Date: Mon, 19 Dec 2011 11:09:33 +0100 [thread overview]
Message-ID: <1324289373-4909-1-git-send-email-igorm@etf.rs> (raw)
In-Reply-To: <igorm@etf.rs>
From: Igor Maravic <igorm@etf.rs>
Changes to r8169 to use byte queue limits.
Signed-off-by: Igor Maravic <igorm@etf.rs>
---
drivers/net/ethernet/realtek/r8169.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 36b2a4b..1a6a12a 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)
@@ -5546,6 +5547,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
tp->cur_tx += frags + 1;
+ netdev_sent_queue(dev, skb->len);
+
wmb();
RTL_W8(TxPoll, NPQ);
@@ -5624,6 +5627,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 +5647,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
next reply other threads:[~2011-12-19 10:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-19 10:09 igorm [this message]
2011-12-19 10:19 ` [PATCH net-next] r8169: Support for byte queue limits Eric Dumazet
-- strict thread matches above, loose matches on Subject: below --
2011-12-19 10:28 igorm
2011-12-19 19:18 ` David Miller
2011-12-19 9:27 igorm
2011-12-19 9:29 ` Igor Maravić
2011-12-19 9:46 ` Eric Dumazet
2011-12-19 9:53 ` Igor Maravić
2011-12-12 13:00 igorm
2011-12-16 21:15 ` David Miller
2011-12-16 21:30 ` Eric Dumazet
2011-12-17 17:28 ` Igor Maravić
2011-12-06 9:13 igorm
2011-12-06 9:15 ` Igor Maravić
2011-12-06 18:13 ` David Miller
2011-12-06 21:36 ` Igor Maravić
2011-12-06 21:41 ` David Miller
2011-12-02 13:09 igorm
2011-12-02 14:29 ` Eric Dumazet
2011-12-02 14:54 ` Igor Maravić
2011-12-02 15:11 ` Eric Dumazet
2011-12-02 16:31 ` "Igor Maravić"
2011-12-02 16:47 ` Eric Dumazet
2011-12-02 17:00 ` Igor Maravić
2011-12-02 17:12 ` Eric Dumazet
2011-12-02 21:54 ` Igor Maravić
2011-12-03 6:48 ` Eric Dumazet
2011-12-03 0:20 ` Francois Romieu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1324289373-4909-1-git-send-email-igorm@etf.rs \
--to=igorm@etf.rs \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
--cc=romieu@fr.zoreil.com \
--cc=therbert@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).