From: Deepak S <deepak.s@linux.intel.com>
Date: Thu, 6 Dec 2018 02:59:38 +0000 (+0000)
Subject: Merge "Fix potential crash when getting device info"
X-Git-Tag: opnfv-10.0.0~137
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47123bfc1b3c0d0b01884aebbce1a3e09ad7ddb0;hp=2a16001e311b414bdadd42d048a12e6995a0e20e;p=samplevnf.git

Merge "Fix potential crash when getting device info"
---

diff --git a/VNFs/DPPD-PROX/prox_args.c b/VNFs/DPPD-PROX/prox_args.c
index c09c563d..59c514fc 100644
--- a/VNFs/DPPD-PROX/prox_args.c
+++ b/VNFs/DPPD-PROX/prox_args.c
@@ -559,6 +559,23 @@ static int get_port_cfg(unsigned sindex, char *str, void *data)
 		else
 			cfg->requested_rx_offload &= ~DEV_RX_OFFLOAD_CRC_STRIP;
 	}
+	else if (STR_EQ(str, "vlan")) {
+#if RTE_VERSION >= RTE_VERSION_NUM(18,8,0,1)
+		uint32_t val;
+		if (parse_bool(&val, pkey)) {
+			return -1;
+		}
+		if (val) {
+			cfg->requested_rx_offload |= DEV_RX_OFFLOAD_VLAN_STRIP;
+			cfg->requested_tx_offload |= DEV_TX_OFFLOAD_VLAN_INSERT;
+		} else {
+			cfg->requested_rx_offload &= ~DEV_RX_OFFLOAD_VLAN_STRIP;
+			cfg->requested_tx_offload &= ~DEV_TX_OFFLOAD_VLAN_INSERT;
+		}
+#else
+		plog_warn("vlan option not supported : update DPDK at least to 18.08 to support this option\n");
+#endif
+	}
 	else if (STR_EQ(str, "mtu size")) {
 		uint32_t val;
 		if (parse_int(&val, pkey)) {
diff --git a/VNFs/DPPD-PROX/prox_port_cfg.c b/VNFs/DPPD-PROX/prox_port_cfg.c
index 5de9dd34..5c5ca58f 100644
--- a/VNFs/DPPD-PROX/prox_port_cfg.c
+++ b/VNFs/DPPD-PROX/prox_port_cfg.c
@@ -462,6 +462,7 @@ static void init_port(struct prox_port_cfg *port_cfg)
 #if RTE_VERSION >= RTE_VERSION_NUM(18,8,0,1)
 	CONFIGURE_RX_OFFLOAD(DEV_RX_OFFLOAD_CRC_STRIP);
 	CONFIGURE_RX_OFFLOAD(DEV_RX_OFFLOAD_JUMBO_FRAME);
+	CONFIGURE_RX_OFFLOAD(DEV_RX_OFFLOAD_VLAN_STRIP);
 #else
 	if (port_cfg->requested_rx_offload & DEV_RX_OFFLOAD_CRC_STRIP) {
 		port_cfg->port_conf.rxmode.hw_strip_crc = 1;
@@ -475,6 +476,7 @@ static void init_port(struct prox_port_cfg *port_cfg)
 #if RTE_VERSION >= RTE_VERSION_NUM(18,8,0,1)
 	CONFIGURE_TX_OFFLOAD(DEV_TX_OFFLOAD_IPV4_CKSUM);
 	CONFIGURE_TX_OFFLOAD(DEV_TX_OFFLOAD_UDP_CKSUM);
+	CONFIGURE_TX_OFFLOAD(DEV_TX_OFFLOAD_VLAN_INSERT);
 #else
 	if ((port_cfg->dev_info.tx_offload_capa & (DEV_TX_OFFLOAD_IPV4_CKSUM | DEV_TX_OFFLOAD_UDP_CKSUM)) == 0) {
 		port_cfg->tx_conf.txq_flags |= ETH_TXQ_FLAGS_NOOFFLOADS;
diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 00000000..1376a69f
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,19 @@
+.. _samplevnf:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. SPDX-License-Identifier CC-BY-4.0
+.. (c) Open Platform for NFV Project, Inc. and its contributors
+
+*********************************
+OPNFV Samplevnf
+*********************************
+
+.. toctree::
+   :numbered:
+   :maxdepth: 1
+
+   release/release-notes/index
+   release/results/index
+   testing/developer/index
+   testing/user/userguide/index