Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
bnx2x: Multi Queue
The multi queue support is still disabled by default for the bnx2x
(needs some more testing and validation), but there are 2 obvious bug in
it which are fixed in this patch
Signed-off-by: Yitchak Gertner <gertner@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by Yitchak Gertner and committed by David S. Miller 231fd58a 65abd74d
+2
-4
drivers/net/bnx2x_main.c
+2
-4
drivers/net/bnx2x_main.c
···
6492
6492
6493
6493
/* halt the connection */
6494
6494
bp->fp[index].state = BNX2X_FP_STATE_HALTING;
6495
-
bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, index, 0, 0, 0);
6495
+
bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, index, 0, index, 0);
6496
6496
6497
6497
/* Wait for completion */
6498
6498
rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, index,
···
9492
9492
fp_index = (smp_processor_id() % bp->num_queues);
9493
9493
fp = &bp->fp[fp_index];
9494
9494
9495
-
if (unlikely(bnx2x_tx_avail(bp->fp) <
9496
-
(skb_shinfo(skb)->nr_frags + 3))) {
9495
+
if (unlikely(bnx2x_tx_avail(fp) < (skb_shinfo(skb)->nr_frags + 3))) {
9497
9496
bp->eth_stats.driver_xoff++,
9498
9497
netif_stop_queue(dev);
9499
9498
BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
···
9555
9556
tx_bd->vlan = cpu_to_le16(pkt_prod);
9556
9557
9557
9558
if (xmit_type) {
9558
-
9559
9559
/* turn on parsing and get a BD */
9560
9560
bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
9561
9561
pbd = (void *)&fp->tx_desc_ring[bd_prod];