diff options
| author |   Hongjun Ni <hongjun.ni@intel.com> | 2018-06-02 02:23:05 +0800 |
|---|---|---|
| committer | Hongjun Ni <hongjun.ni@intel.com> | 2018-06-02 02:59:24 +0800 |
| commit | 1c0965c40377d43ae3810cd0581347cc24960d18 (patch) | |
| tree | 9b3370c490d64aa50bbde7ff703059070770d8c0 | |
| parent | d6b91c3eaba5e9479cf04595df9ca9b4eb56c4b4 (diff) | |
Bump master's JVPP version to 18.07HEADv18.10-rc0master
Change-Id: Ic74ff2da23facce1bf843f3df2ab30cbe2caeb77
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
| -rw-r--r-- | nsh-plugin/configure.ac | 2 | ||||
| -rw-r--r-- | nsh-plugin/java/jvpp/pom.xml | 4 | ||||
| -rw-r--r-- | nsh-plugin/java/pom.xml | 4 | ||||
| -rw-r--r-- | nsh-plugin/nsh/nsh.h | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/nsh-plugin/configure.ac b/nsh-plugin/configure.ac index 0557b01..2c69db6 100644 --- a/nsh-plugin/configure.ac +++ b/nsh-plugin/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(nsh_plugin, 18.04) +AC_INIT(nsh_plugin, 18.07) AM_INIT_AUTOMAKE AC_PROG_LIBTOOL diff --git a/nsh-plugin/java/jvpp/pom.xml b/nsh-plugin/java/jvpp/pom.xml index f6229d7..6d29017 100644 --- a/nsh-plugin/java/jvpp/pom.xml +++ b/nsh-plugin/java/jvpp/pom.xml @@ -4,7 +4,7 @@ <groupId>io.fd.nsh_sfc</groupId> <artifactId>nsh-sfc</artifactId> - <version>18.04-SNAPSHOT</version> + <version>18.07-SNAPSHOT</version> <packaging>jar</packaging> <name>nsh-sfc</name> @@ -14,7 +14,7 @@ <dependency> <groupId>io.fd.vpp</groupId> <artifactId>jvpp-registry</artifactId> - <version>18.04-SNAPSHOT</version> + <version>18.07-SNAPSHOT</version> </dependency> </dependencies> diff --git a/nsh-plugin/java/pom.xml b/nsh-plugin/java/pom.xml index 8e913c8..65a7dab 100644 --- a/nsh-plugin/java/pom.xml +++ b/nsh-plugin/java/pom.xml @@ -4,7 +4,7 @@ <groupId>io.fd.nsh_sfc</groupId> <artifactId>nsh-sfc</artifactId> - <version>18.04-SNAPSHOT</version> + <version>18.07-SNAPSHOT</version> <packaging>jar</packaging> <name>nsh-sfc</name> @@ -18,7 +18,7 @@ <dependency> <groupId>io.fd.vpp</groupId> <artifactId>jvpp-registry</artifactId> - <version>18.04-SNAPSHOT</version> + <version>18.07-SNAPSHOT</version> </dependency> </dependencies> diff --git a/nsh-plugin/nsh/nsh.h b/nsh-plugin/nsh/nsh.h index d763f87..1b14567 100644 --- a/nsh-plugin/nsh/nsh.h +++ b/nsh-plugin/nsh/nsh.h @@ -34,6 +34,9 @@ typedef struct { * rewrite and rewrite_size used to support varied nsh header */ typedef struct { + /* Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + nsh_base_header_t nsh_base; union { nsh_md1_data_t md1_data; @@ -54,6 +57,9 @@ typedef struct { } nsh_add_del_entry_args_t; typedef struct { + /* Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + /** Key for nsh_header_t entry: 24bit NSP 8bit NSI */ u32 nsp_nsi; /** Key for nsh_header_t entry to map to. : 24bit NSP 8bit NSI |