mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-25 11:55:37 +00:00
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says: ==================== Intel Wired LAN Driver Updates 2022-11-30 (e1000e, igb) This series contains updates to e1000e and igb drivers. Akihiko Odaki fixes calculation for checking whether space for next frame exists for e1000e and properly sets MSI-X vector to fix failing ethtool interrupt test for igb. * '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue: igb: Allocate MSI-X vector when testing e1000e: Fix TX dispatch condition ==================== Link: https://lore.kernel.org/r/20221130194228.3257787-1-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
4eb0c28551
2 changed files with 4 additions and 2 deletions
|
@ -5936,9 +5936,9 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
|
||||||
e1000_tx_queue(tx_ring, tx_flags, count);
|
e1000_tx_queue(tx_ring, tx_flags, count);
|
||||||
/* Make sure there is space in the ring for the next send. */
|
/* Make sure there is space in the ring for the next send. */
|
||||||
e1000_maybe_stop_tx(tx_ring,
|
e1000_maybe_stop_tx(tx_ring,
|
||||||
(MAX_SKB_FRAGS *
|
((MAX_SKB_FRAGS + 1) *
|
||||||
DIV_ROUND_UP(PAGE_SIZE,
|
DIV_ROUND_UP(PAGE_SIZE,
|
||||||
adapter->tx_fifo_limit) + 2));
|
adapter->tx_fifo_limit) + 4));
|
||||||
|
|
||||||
if (!netdev_xmit_more() ||
|
if (!netdev_xmit_more() ||
|
||||||
netif_xmit_stopped(netdev_get_tx_queue(netdev, 0))) {
|
netif_xmit_stopped(netdev_get_tx_queue(netdev, 0))) {
|
||||||
|
|
|
@ -1413,6 +1413,8 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data)
|
||||||
*data = 1;
|
*data = 1;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
wr32(E1000_IVAR_MISC, E1000_IVAR_VALID << 8);
|
||||||
|
wr32(E1000_EIMS, BIT(0));
|
||||||
} else if (adapter->flags & IGB_FLAG_HAS_MSI) {
|
} else if (adapter->flags & IGB_FLAG_HAS_MSI) {
|
||||||
shared_int = false;
|
shared_int = false;
|
||||||
if (request_irq(irq,
|
if (request_irq(irq,
|
||||||
|
|
Loading…
Reference in a new issue