Unverified Commit dba34786 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5715 net: hns3: updates 2024.04.02 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yonglong Liu <liuyonglong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/X4YU6OAYDJMYWV7YTFVXU4DHCWQHG4R3/ 
This patch set fix a bug for hns3 driver and modify the driver
version.

Yonglong Liu (2):
  net: hns3: fix port vlan filter not disabled problem in dynamic vlan
  net: hns3: update hns3 version to 24.3.1


-- 
2.17.1
 
https://gitee.com/openeuler/kernel/issues/I9D6UN 
 
Link:https://gitee.com/openeuler/kernel/pulls/5715

 

Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 4e763e2c 121f7cbf

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <linux/types.h>

#include <net/pkt_cls.h>



#define HNAE3_MOD_VERSION "24.2.1"

#define HNAE3_MOD_VERSION "24.3.1"



#define HNAE3_MIN_VECTOR_NUM	2 /* first one for misc, another for IO */

drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#ifndef __HNS3_CAE_VERSION_H__

#define __HNS3_CAE_VERSION_H__



#define HNS3_CAE_MOD_VERSION "24.2.1"

#define HNS3_CAE_MOD_VERSION "24.3.1"



#define CMT_ID_LEN 8

#define RESV_LEN 3

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include "hnae3.h"



#define HNS3_MOD_VERSION "24.2.1"

#define HNS3_MOD_VERSION "24.3.1"



extern char hns3_driver_version[];

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

+7 −2
Original line number Diff line number Diff line
@@ -8809,6 +8809,8 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev) 
	int i;



	if (hdev->pdev->revision >= HNAE3_REVISION_ID_21) {

		bool enable = true;



		/* for revision 0x21, vf vlan filter is per function */

		for (i = 0; i < hdev->num_alloc_vport; i++) {

			vport = &hdev->vport[i];
@@ -8822,9 +8824,12 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev) 
			vport->cur_vlan_fltr_en = true;

		}



		if (hnae3_dev_vlan_fltr_mdf_supported(hdev))

			enable = false;



		ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT,

						 HCLGE_FILTER_FE_INGRESS, true,

						 0);

						 HCLGE_FILTER_FE_INGRESS,

						 enable, 0);

		if (ret)

			return ret;

	} else {

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "hclge_cmd.h"

#include "hnae3.h"



#define HCLGE_MOD_VERSION "24.2.1"

#define HCLGE_MOD_VERSION "24.3.1"

#define HCLGE_DRIVER_NAME "hclge"



#define HCLGE_MAX_PF_NUM		8