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

!1326 [OLK-5.10] net: hns3: backport the clean up refine the tcam key convert... 

!1326 [OLK-5.10] net: hns3: backport the clean up refine the tcam key convert handle and clear hns3 unused parameter alarm

Merge Pull Request from: @svishen 
 
Backport some clean up from mainline for hns3

issue:
https://gitee.com/openeuler/kernel/issues/I7IEJR 
 
Link:https://gitee.com/openeuler/kernel/pulls/1326

 

Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 1434918c 99dc18e8

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

+1 −2
Original line number Diff line number Diff line
@@ -667,8 +667,7 @@ struct hnae3_ae_ops { 
	int (*rm_mc_addr)(struct hnae3_handle *handle,

			  const unsigned char *addr);

	void (*set_tso_stats)(struct hnae3_handle *handle, int enable);

	void (*update_stats)(struct hnae3_handle *handle,

			     struct net_device_stats *net_stats);

	void (*update_stats)(struct hnae3_handle *handle);

	void (*get_stats)(struct hnae3_handle *handle, u64 *data);

	void (*get_mac_stats)(struct hnae3_handle *handle,

			      struct hns3_mac_stats *mac_stats);

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c

+1 −2
Original line number Diff line number Diff line
@@ -305,8 +305,7 @@ int hclge_comm_set_rss_indir_table(struct hnae3_ae_dev *ae_dev, 
	return 0;

}



int hclge_comm_set_rss_input_tuple(struct hnae3_handle *nic,

				   struct hclge_comm_hw *hw, bool is_pf,

int hclge_comm_set_rss_input_tuple(struct hclge_comm_hw *hw,

				   struct hclge_comm_rss_cfg *rss_cfg)

{

	struct hclge_comm_rss_input_tuple_cmd *req;

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h

+1 −2
Original line number Diff line number Diff line
@@ -112,8 +112,7 @@ int hclge_comm_init_rss_tuple_cmd(struct hclge_comm_rss_cfg *rss_cfg, 
				  struct hnae3_ae_dev *ae_dev,

				  struct hclge_comm_rss_input_tuple_cmd *req);

u64 hclge_comm_convert_rss_tuple(u8 tuple_sets);

int hclge_comm_set_rss_input_tuple(struct hnae3_handle *nic,

				   struct hclge_comm_hw *hw, bool is_pf,

int hclge_comm_set_rss_input_tuple(struct hclge_comm_hw *hw,

				   struct hclge_comm_rss_cfg *rss_cfg);

int hclge_comm_set_rss_indir_table(struct hnae3_ae_dev *ae_dev,

				   struct hclge_comm_hw *hw, const u16 *indir);

drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

+2 −3
Original line number Diff line number Diff line
@@ -965,8 +965,7 @@ static const struct hns3_dbg_item tx_bd_info_items[] = { 
	{ "MSS_HW_CSUM", 0 },

};



static void hns3_dump_tx_bd_info(struct hns3_nic_priv *priv,

				 struct hns3_desc *desc, char **result, int idx)

static void hns3_dump_tx_bd_info(struct hns3_desc *desc, char **result, int idx)

{

	unsigned int j = 0;
@@ -1015,7 +1014,7 @@ static int hns3_dbg_tx_bd_info(struct hns3_dbg_data *d, char *buf, int len) 
	for (i = 0; i < ring->desc_num; i++) {

		desc = &ring->desc[i];



		hns3_dump_tx_bd_info(priv, desc, result, i);

		hns3_dump_tx_bd_info(desc, result, i);

		hns3_dbg_fill_content(content, sizeof(content),

				      tx_bd_info_items, (const char **)result,

				      ARRAY_SIZE(tx_bd_info_items));

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

+1 −1
Original line number Diff line number Diff line
@@ -2775,7 +2775,7 @@ static void hns3_nic_get_stats64(struct net_device *netdev, 
	if (test_bit(HNS3_NIC_STATE_DOWN, &priv->state))

		return;



	handle->ae_algo->ops->update_stats(handle, &netdev->stats);

	handle->ae_algo->ops->update_stats(handle);



	memset(&ring_total_stats, 0, sizeof(ring_total_stats));

	for (idx = 0; idx < queue_num; idx++) {