Skip to contentSkip to conversation

Patch "net: hns3: fix the TX/RX ring.queue_index in hns3_ring_get_cfg" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Dec 18, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

net: hns3: fix the TX/RX ring.queue_index in hns3_ring_get_cfg

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-hns3-fix-the-tx-rx-ring.queue_index-in-hns3_ring_get_cfg.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Mon Dec 18 13:28:59 CET 2017

From: Lipeng <[email protected]>
Date: Mon, 23 Oct 2017 19:51:05 +0800
Subject: net: hns3: fix the TX/RX ring.queue_index in hns3_ring_get_cfg

From: Lipeng <[email protected]>

[ Upstream commit 66b447301ac710ee237dba8b653244018fbb6168 ]

The interface hns3_ring_get_cfg only update TX ring queue_index, but do not update RX ring queue_index. This patch fixes it.

Fixes 76ad4f0 (net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC)
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c +2 -2
@@ -2488,16 +2488,16 @@ static int hns3_ring_get_cfg(struct hnae
 
 	if (ring_type == HNAE3_RING_TYPE_TX) {
 		ring_data[q->tqp_index].ring = ring;
+		ring_data[q->tqp_index].queue_index = q->tqp_index;
 		ring->io_base = (u8 __iomem *)q->io_base + HNS3_TX_REG_OFFSET;
 	} else {
 		ring_data[q->tqp_index + queue_num].ring = ring;
+		ring_data[q->tqp_index + queue_num].queue_index = q->tqp_index;
 		ring->io_base = q->io_base;
 	}
 
 	hnae_set_bit(ring->flag, HNAE3_RING_TYPE_B, ring_type);
 
-	ring_data[q->tqp_index].queue_index = q->tqp_index;
-
 	ring->tqp = q;
 	ring->desc = NULL;
 	ring->desc_cb = NULL;

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/net-hns3-fix-the-tx-rx-ring.queue_index-in-hns3_ring_get_cfg.patch queue-4.14/net-hns3-fix-the-bug-when-map-buffer-fail.patch queue-4.14/net-hns3-fix-a-bug-when-alloc-new-buffer.patch queue-4.14/net-hns3-fix-the-bug-of-hns3_set_txbd_baseinfo.patch queue-4.14/net-hns3-fix-a-bug-in-hclge_uninit_client_instance.patch queue-4.14/net-hns3-fix-a-misuse-to-devm_free_irq.patch queue-4.14/net-hns3-fix-for-getting-advertised_caps-in-hns3_get_link_ksettings.patch queue-4.14/net-hns3-add-nic_client-check-when-initialize-roce-base-information.patch