From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ferruh.yigit@intel.com>
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
 by dpdk.org (Postfix) with ESMTP id 01DA85588
 for <dev@dpdk.org>; Tue, 13 Dec 2016 14:40:42 +0100 (CET)
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
 by orsmga103.jf.intel.com with ESMTP; 13 Dec 2016 05:40:41 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.33,341,1477983600"; d="scan'208";a="42084104"
Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.220.29])
 ([10.237.220.29])
 by fmsmga006.fm.intel.com with ESMTP; 13 Dec 2016 05:40:40 -0800
To: Wenzhuo Lu <wenzhuo.lu@intel.com>, dev@dpdk.org
References: <1480637533-37425-1-git-send-email-wenzhuo.lu@intel.com>
 <1481081535-37448-1-git-send-email-wenzhuo.lu@intel.com>
 <1481081535-37448-26-git-send-email-wenzhuo.lu@intel.com>
Cc: Bernard Iremonger <bernard.iremonger@intel.com>
From: Ferruh Yigit <ferruh.yigit@intel.com>
Message-ID: <5224578d-3ec2-48e6-5ce3-91cd4bc467b0@intel.com>
Date: Tue, 13 Dec 2016 13:40:40 +0000
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.5.1
MIME-Version: 1.0
In-Reply-To: <1481081535-37448-26-git-send-email-wenzhuo.lu@intel.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [dpdk-dev] [PATCH v2 25/32] app/testpmd: handle i40e in VF VLAN
 filter command
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Dec 2016 13:40:43 -0000

Hi Wenzhuo,

On 12/7/2016 3:32 AM, Wenzhuo Lu wrote:
> modify set_vf_rx_vlan function to handle the i40e PMD.
> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> ---

Latest applied patches [1] conflict with some testpmd patches of this
patchset.

Can you please rebase this patchset on top of the latest next-net?

[1]
http://dpdk.org/dev/patchwork/patch/17896 - 17902

Thanks,
ferruh

>  app/test-pmd/config.c | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index 36c47ab..0368dc6 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -92,6 +92,9 @@
>  #include <rte_ethdev.h>
>  #include <rte_string_fns.h>
>  #include <rte_cycles.h>
> +#ifdef RTE_LIBRTE_I40E_PMD
> +#include <rte_pmd_i40e.h>
> +#endif
>  
>  #include "testpmd.h"
>  
> @@ -2349,12 +2352,24 @@ struct igb_ring_desc_16_bytes {
>  set_vf_rx_vlan(portid_t port_id, uint16_t vlan_id, uint64_t vf_mask, uint8_t on)
>  {
>  	int diag;
> +	struct rte_eth_dev_info dev_info;
>  
>  	if (port_id_is_invalid(port_id, ENABLED_WARN))
>  		return;
>  	if (vlan_id_is_invalid(vlan_id))
>  		return;
> -	diag = rte_eth_dev_set_vf_vlan_filter(port_id, vlan_id, vf_mask, on);
> +
> +	rte_eth_dev_info_get(port_id, &dev_info);
> +
> +#ifdef RTE_LIBRTE_I40E_PMD
> +	if (strstr(dev_info.driver_name, "i40e") != NULL)
> +		diag = rte_pmd_i40e_set_vf_vlan_filter(port_id, vlan_id,
> +						       vf_mask, on);
> +	else
> +#endif
> +		diag = rte_eth_dev_set_vf_vlan_filter(port_id, vlan_id,
> +						      vf_mask, on);
> +
>  	if (diag == 0)
>  		return;
>  	printf("rte_eth_dev_set_vf_vlan_filter for port_id=%d failed "
>