50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From: Tom Herbert <therbert@google.com>
|
|
Date: Mon, 5 Mar 2012 19:53:50 +0000
|
|
Subject: tg3: Fix to use multi queue BQL interfaces
|
|
|
|
commit 5cb917bc4f3882ecee87064483111023086757d3 upstream.
|
|
|
|
Fix tg3 to use BQL multi queue related netdev interfaces since the
|
|
device supports multi queue.
|
|
|
|
Signed-off-by: Tom Herbert <therbert@google.com>
|
|
Reported-by: Christoph Lameter <cl@gentwo.org>
|
|
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/broadcom/tg3.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
|
|
index 423d023..35c2a20 100644
|
|
--- a/drivers/net/ethernet/broadcom/tg3.c
|
|
+++ b/drivers/net/ethernet/broadcom/tg3.c
|
|
@@ -5352,7 +5352,7 @@ static void tg3_tx(struct tg3_napi *tnapi)
|
|
}
|
|
}
|
|
|
|
- netdev_completed_queue(tp->dev, pkts_compl, bytes_compl);
|
|
+ netdev_tx_completed_queue(txq, pkts_compl, bytes_compl);
|
|
|
|
tnapi->tx_cons = sw_idx;
|
|
|
|
@@ -6793,7 +6793,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
}
|
|
|
|
skb_tx_timestamp(skb);
|
|
- netdev_sent_queue(tp->dev, skb->len);
|
|
+ netdev_tx_sent_queue(txq, skb->len);
|
|
|
|
/* Packets are ready, update Tx producer idx local and on card. */
|
|
tw32_tx_mbox(tnapi->prodmbox, entry);
|
|
@@ -7275,8 +7275,8 @@ static void tg3_free_rings(struct tg3 *tp)
|
|
|
|
dev_kfree_skb_any(skb);
|
|
}
|
|
+ netdev_tx_reset_queue(netdev_get_tx_queue(tp->dev, j));
|
|
}
|
|
- netdev_reset_queue(tp->dev);
|
|
}
|
|
|
|
/* Initialize tx/rx rings for packet processing.
|