64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
From: Tom Herbert <therbert@google.com>
|
|
Date: Mon, 28 Nov 2011 16:33:16 +0000
|
|
Subject: e1000e: Support for byte queue limits
|
|
|
|
commit 3f0cfa3bc11e7f00c9994e0f469cbc0e7da7b00c upstream.
|
|
|
|
Changes to e1000e to use byte queue limits.
|
|
|
|
Signed-off-by: Tom Herbert <therbert@google.com>
|
|
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/intel/e1000e/netdev.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
|
|
index a5bd7a3..c6e9763 100644
|
|
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
|
|
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
|
|
@@ -1079,6 +1079,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
|
|
unsigned int i, eop;
|
|
unsigned int count = 0;
|
|
unsigned int total_tx_bytes = 0, total_tx_packets = 0;
|
|
+ unsigned int bytes_compl = 0, pkts_compl = 0;
|
|
|
|
i = tx_ring->next_to_clean;
|
|
eop = tx_ring->buffer_info[i].next_to_watch;
|
|
@@ -1096,6 +1097,10 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
|
|
if (cleaned) {
|
|
total_tx_packets += buffer_info->segs;
|
|
total_tx_bytes += buffer_info->bytecount;
|
|
+ if (buffer_info->skb) {
|
|
+ bytes_compl += buffer_info->skb->len;
|
|
+ pkts_compl++;
|
|
+ }
|
|
}
|
|
|
|
e1000_put_txbuf(adapter, buffer_info);
|
|
@@ -1114,6 +1119,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
|
|
|
|
tx_ring->next_to_clean = i;
|
|
|
|
+ netdev_completed_queue(netdev, pkts_compl, bytes_compl);
|
|
+
|
|
#define TX_WAKE_THRESHOLD 32
|
|
if (count && netif_carrier_ok(netdev) &&
|
|
e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) {
|
|
@@ -2240,6 +2247,7 @@ static void e1000_clean_tx_ring(struct e1000_adapter *adapter)
|
|
e1000_put_txbuf(adapter, buffer_info);
|
|
}
|
|
|
|
+ netdev_reset_queue(adapter->netdev);
|
|
size = sizeof(struct e1000_buffer) * tx_ring->count;
|
|
memset(tx_ring->buffer_info, 0, size);
|
|
|
|
@@ -5027,6 +5035,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
|
|
/* if count is 0 then mapping error has occurred */
|
|
count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss);
|
|
if (count) {
|
|
+ netdev_sent_queue(netdev, skb->len);
|
|
e1000_tx_queue(adapter, tx_flags, count);
|
|
/* Make sure there is space in the ring for the next send. */
|
|
e1000_maybe_stop_tx(netdev, MAX_SKB_FRAGS + 2);
|