From: Chenmin Sun <chenmin.sun@intel.com>
Date: Mon, 27 May 2019 14:05:42 +0000 (+0800)
Subject: dpdk: vlan strip config does not take effect in default device
X-Git-Tag: v20.01-rc0~555
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F19833%2F3;p=vpp.git

dpdk: vlan strip config does not take effect in default device

copy vlan strip config from default device

Change-Id: I4ad1c159bad964fd1900b5ae4960b7014dd9f9b1
Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
---

diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index 22ea659094b..7e5cc08f597 100644
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -1372,6 +1372,12 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
     /* default per-device config items */
     foreach_dpdk_device_config_item
 
+    /* copy vlan_strip config from default device */
+	if (devconf->vlan_strip_offload == 0 &&
+		conf->default_devconf.vlan_strip_offload > 0)
+		devconf->vlan_strip_offload =
+			conf->default_devconf.vlan_strip_offload;
+
     /* add DPDK EAL whitelist/blacklist entry */
     if (num_whitelisted > 0 && devconf->is_blacklisted == 0)
       {