From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nithin Kumar Dabilpuram Subject: [PATCH] app/testpmd: fix tx vlan and qinq insert enable Date: Tue, 19 Feb 2019 06:48:59 +0000 Message-ID: <20190219064840.12046-1-ndabilpuram@marvell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: "dev@dpdk.org" , Jerin Jacob Kollanukkaran , Nithin Kumar Dabilpuram To: Wenzhuo Lu , Jingjing Wu , Bernard Iremonger Return-path: Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 2CCB35B12 for ; Tue, 19 Feb 2019 07:49:06 +0100 (CET) Content-Language: en-US List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Tx VLAN & QinQ insert enable need not depend on Rx VLAN offload ETH_VLAN_EXTEND_OFFLOAD. Also enable DEV_TX_OFFLOAD_VLAN_INSERT for tx_qinq_set() as it takes both vlan id's. Signed-off-by: Nithin Dabilpuram --- app/test-pmd/config.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index b9e5dd9..0243f07 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2955,7 +2955,6 @@ vlan_tpid_set(portid_t port_id, enum rte_vlan_type vl= an_type, uint16_t tp_id) void tx_vlan_set(portid_t port_id, uint16_t vlan_id) { - int vlan_offload; struct rte_eth_dev_info dev_info; =20 if (port_id_is_invalid(port_id, ENABLED_WARN)) @@ -2963,11 +2962,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id) if (vlan_id_is_invalid(vlan_id)) return; =20 - vlan_offload =3D rte_eth_dev_get_vlan_offload(port_id); - if (vlan_offload & ETH_VLAN_EXTEND_OFFLOAD) { - printf("Error, as QinQ has been enabled.\n"); - return; - } rte_eth_dev_info_get(port_id, &dev_info); if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VLAN_INSERT) =3D=3D 0) { printf("Error: vlan insert is not supported by port %d\n", @@ -2983,7 +2977,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id) void tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) { - int vlan_offload; struct rte_eth_dev_info dev_info; =20 if (port_id_is_invalid(port_id, ENABLED_WARN)) @@ -2993,11 +2986,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint= 16_t vlan_id_outer) if (vlan_id_is_invalid(vlan_id_outer)) return; =20 - vlan_offload =3D rte_eth_dev_get_vlan_offload(port_id); - if (!(vlan_offload & ETH_VLAN_EXTEND_OFFLOAD)) { - printf("Error, as QinQ hasn't been enabled.\n"); - return; - } rte_eth_dev_info_get(port_id, &dev_info); if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) =3D=3D 0) { printf("Error: qinq insert not supported by port %d\n", @@ -3006,7 +2994,8 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint1= 6_t vlan_id_outer) } =20 tx_vlan_reset(port_id); - ports[port_id].dev_conf.txmode.offloads |=3D DEV_TX_OFFLOAD_QINQ_INSERT; + ports[port_id].dev_conf.txmode.offloads |=3D (DEV_TX_OFFLOAD_VLAN_INSERT = | + DEV_TX_OFFLOAD_QINQ_INSERT); ports[port_id].tx_vlan_id =3D vlan_id; ports[port_id].tx_vlan_id_outer =3D vlan_id_outer; } --=20 2.8.4