Re: [PATCH v2 11/15] net/hns3: remove invalid encapsulation function

[Ferruh Yigit <ferruh.yigit@intel.com>]

On 1/22/2022 1:51 AM, Min Hu (Connor) wrote:
> From: Chengwen Feng <fengchengwen@huawei.com>
> 
> This patch remove invalid encapsulation functions.

removed functions don't look like encapsulation functions, updating
commit log while merging.

> 
> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
> ---
>   drivers/net/hns3/hns3_ethdev.c    | 27 ++++++++-------------------
>   drivers/net/hns3/hns3_ethdev_vf.c | 13 ++-----------
>   2 files changed, 10 insertions(+), 30 deletions(-)
> 
> diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
> index 9db0cb19f8..491fa41888 100644
> --- a/drivers/net/hns3/hns3_ethdev.c
> +++ b/drivers/net/hns3/hns3_ethdev.c
> @@ -593,22 +593,6 @@ hns3_set_vlan_rx_offload_cfg(struct hns3_adapter *hns,
>   	return ret;
>   }
>   
> -static void
> -hns3_update_rx_offload_cfg(struct hns3_adapter *hns,
> -			   struct hns3_rx_vtag_cfg *vcfg)
> -{
> -	struct hns3_pf *pf = &hns->pf;
> -	memcpy(&pf->vtag_config.rx_vcfg, vcfg, sizeof(pf->vtag_config.rx_vcfg));
> -}
> -
> -static void
> -hns3_update_tx_offload_cfg(struct hns3_adapter *hns,
> -			   struct hns3_tx_vtag_cfg *vcfg)
> -{
> -	struct hns3_pf *pf = &hns->pf;
> -	memcpy(&pf->vtag_config.tx_vcfg, vcfg, sizeof(pf->vtag_config.tx_vcfg));
> -}
> -
>   static int
>   hns3_en_hw_strip_rxvtag(struct hns3_adapter *hns, bool enable)
>   {
> @@ -638,7 +622,8 @@ hns3_en_hw_strip_rxvtag(struct hns3_adapter *hns, bool enable)
>   		return ret;
>   	}
>   
> -	hns3_update_rx_offload_cfg(hns, &rxvlan_cfg);
> +	memcpy(&hns->pf.vtag_config.rx_vcfg, &rxvlan_cfg,
> +	       sizeof(struct hns3_rx_vtag_cfg));
>   
>   	return ret;
>   }
> @@ -836,7 +821,9 @@ hns3_vlan_txvlan_cfg(struct hns3_adapter *hns, uint16_t port_base_vlan_state,
>   		return ret;
>   	}
>   
> -	hns3_update_tx_offload_cfg(hns, &txvlan_cfg);
> +	memcpy(&hns->pf.vtag_config.tx_vcfg, &txvlan_cfg,
> +	       sizeof(struct hns3_tx_vtag_cfg));
> +
>   	return ret;
>   }
>   
> @@ -962,7 +949,9 @@ hns3_en_pvid_strip(struct hns3_adapter *hns, int on)
>   	if (ret)
>   		return ret;
>   
> -	hns3_update_rx_offload_cfg(hns, &rx_vlan_cfg);
> +	memcpy(&hns->pf.vtag_config.rx_vcfg, &rx_vlan_cfg,
> +	       sizeof(struct hns3_rx_vtag_cfg));
> +
>   	return ret;
>   }
>   
> diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
> index a9e129288b..1af2e07e81 100644
> --- a/drivers/net/hns3/hns3_ethdev_vf.c
> +++ b/drivers/net/hns3/hns3_ethdev_vf.c
> @@ -1026,15 +1026,6 @@ hns3vf_get_configuration(struct hns3_hw *hw)
>   	return hns3vf_get_port_base_vlan_filter_state(hw);
>   }
>   
> -static int
> -hns3vf_set_tc_queue_mapping(struct hns3_adapter *hns, uint16_t nb_rx_q,
> -			    uint16_t nb_tx_q)
> -{
> -	struct hns3_hw *hw = &hns->hw;
> -
> -	return hns3_queue_to_tc_mapping(hw, nb_rx_q, nb_tx_q);
> -}
> -
>   static void
>   hns3vf_request_link_info(struct hns3_hw *hw)
>   {
> @@ -1530,7 +1521,7 @@ hns3vf_init_vf(struct rte_eth_dev *eth_dev)
>   		goto err_set_tc_queue;
>   	}
>   
> -	ret = hns3vf_set_tc_queue_mapping(hns, hw->tqps_num, hw->tqps_num);
> +	ret = hns3_queue_to_tc_mapping(hw, hw->tqps_num, hw->tqps_num);
>   	if (ret) {
>   		PMD_INIT_LOG(ERR, "failed to set tc info, ret = %d.", ret);
>   		goto err_set_tc_queue;
> @@ -1739,7 +1730,7 @@ hns3vf_do_start(struct hns3_adapter *hns, bool reset_queue)
>   	uint16_t nb_tx_q = hw->data->nb_tx_queues;
>   	int ret;
>   
> -	ret = hns3vf_set_tc_queue_mapping(hns, nb_rx_q, nb_tx_q);
> +	ret = hns3_queue_to_tc_mapping(hw, nb_rx_q, nb_tx_q);
>   	if (ret)
>   		return ret;
>