Commit c6b42942 authored by Baokun Li's avatar Baokun Li Committed by Zheng Zengkai
Browse files

net: hns3: use list_move_tail instead of list_del/list_add_tail in hclge_main.c 

mainline inclusion
from mainline-master
commit 4724acc4
category: feature
bugzilla: 173966
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4724acc47c9441ec1e131299853d1a9e8c3fb2cd



----------------------------------------------------------------------

Using list_move_tail() instead of list_del() + list_add_tail() in hclge_main.c.

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarYongxin Li <liyongxin1@huawei.com>
Signed-off-by: default avatarJunxin Chen <chenjunxin1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 3b75f7d8

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+5 −10
Original line number Diff line number Diff line
@@ -8834,8 +8834,7 @@ static bool hclge_sync_from_add_list(struct list_head *add_list, 
			kfree(mac_node);

		} else if (mac_node->state == HCLGE_MAC_ACTIVE) {

			mac_node->state = HCLGE_MAC_TO_DEL;

			list_del(&mac_node->node);

			list_add_tail(&mac_node->node, mac_list);

			list_move_tail(&mac_node->node, mac_list);

		} else {

			list_del(&mac_node->node);

			kfree(mac_node);
@@ -8864,8 +8863,7 @@ static void hclge_sync_from_del_list(struct list_head *del_list, 
			list_del(&mac_node->node);

			kfree(mac_node);

		} else {

			list_del(&mac_node->node);

			list_add_tail(&mac_node->node, mac_list);

			list_move_tail(&mac_node->node, mac_list);

		}

	}

}
@@ -8909,8 +8907,7 @@ static void hclge_sync_vport_mac_table(struct hclge_vport *vport, 
	list_for_each_entry_safe(mac_node, tmp, list, node) {

		switch (mac_node->state) {

		case HCLGE_MAC_TO_DEL:

			list_del(&mac_node->node);

			list_add_tail(&mac_node->node, &tmp_del_list);

			list_move_tail(&mac_node->node, &tmp_del_list);

			break;

		case HCLGE_MAC_TO_ADD:

			new_node = kzalloc(sizeof(*new_node), GFP_ATOMIC);
@@ -8992,8 +8989,7 @@ static void hclge_build_del_list(struct list_head *list, 
		switch (mac_cfg->state) {

		case HCLGE_MAC_TO_DEL:

		case HCLGE_MAC_ACTIVE:

			list_del(&mac_cfg->node);

			list_add_tail(&mac_cfg->node, tmp_del_list);

			list_move_tail(&mac_cfg->node, tmp_del_list);

			break;

		case HCLGE_MAC_TO_ADD:

			if (is_del_list) {
@@ -9088,8 +9084,7 @@ static void hclge_uninit_vport_mac_list(struct hclge_vport *vport, 
		switch (mac_node->state) {

		case HCLGE_MAC_TO_DEL:

		case HCLGE_MAC_ACTIVE:

			list_del(&mac_node->node);

			list_add_tail(&mac_node->node, &tmp_del_list);

			list_move_tail(&mac_node->node, &tmp_del_list);

			break;

		case HCLGE_MAC_TO_ADD:

			list_del(&mac_node->node);