From: maryam.tahhan <maryam.tahhan@intel.com>
Date: Mon, 13 Oct 2014 14:17:09 +0000 (+0100)
Subject: netdev-dpdk: Move to DPDK 1.7.1
X-Git-Tag: v2.4.0~1156
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=b35839f3855e3b812709c6ad1c9278f498aa9935

netdev-dpdk: Move to DPDK 1.7.1

This patch updates the documentation to reflect that DPDK 1.7.1
is supported. Travis scripts have also been updated to reflect
this. DPDK phy and ring ports were validated against DPDK 1.7.1.

Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Acked-by: Daniele Di Proietto <ddiproietto@vmware.com>
Acked-by: Thomas Graf <tgraf@noironetworks.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
---

diff --git a/.travis.yml b/.travis.yml
index 4dfe15e58..cd6e623cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install: ./.travis/prepare.sh
 env:
   - OPTS="--disable-ssl"
   - TESTSUITE=1 KERNEL=1 OPTS="--with-linux=./linux-3.16.2"
-  - KERNEL=1 DPDK=1 OPTS="--with-dpdk=./dpdk-1.7.0/build"
+  - KERNEL=1 DPDK=1 OPTS="--with-dpdk=./dpdk-1.7.1/build"
 
 script: ./.travis/build.sh $OPTS
 
diff --git a/.travis/build.sh b/.travis/build.sh
index 3872893b8..5dba4fe3a 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -19,9 +19,9 @@ function install_kernel()
 
 function install_dpdk()
 {
-    wget http://www.dpdk.org/browse/dpdk/snapshot/dpdk-1.7.0.tar.gz
-    tar xzvf dpdk-1.7.0.tar.gz > /dev/null
-    cd dpdk-1.7.0
+    wget http://www.dpdk.org/browse/dpdk/snapshot/dpdk-1.7.1.tar.gz
+    tar xzvf dpdk-1.7.1.tar.gz > /dev/null
+    cd dpdk-1.7.1
     find ./ -type f | xargs sed -i 's/max-inline-insns-single=100/max-inline-insns-single=400/'
     sed -ri 's,(CONFIG_RTE_BUILD_COMBINE_LIBS=).*,\1y,' config/common_linuxapp
     make config CC=gcc T=x86_64-native-linuxapp-gcc
diff --git a/INSTALL.DPDK b/INSTALL.DPDK
index d9a77c98f..accd7936b 100644
--- a/INSTALL.DPDK
+++ b/INSTALL.DPDK
@@ -14,10 +14,10 @@ and "make".
 Building and Installing:
 ------------------------
 
-Required DPDK 1.7.
+Required DPDK 1.7
 
 DPDK:
-Set dir i.g.:   export DPDK_DIR=/usr/src/dpdk-1.7.0
+Set dir i.g.:   export DPDK_DIR=/usr/src/dpdk-1.7.1
 cd $DPDK_DIR
 update config/common_linuxapp so that dpdk generate single lib file.
 (modification also required for IVSHMEM build)
diff --git a/acinclude.m4 b/acinclude.m4
index 9a7ea84fe..f0617df1d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -206,7 +206,7 @@ AC_DEFUN([OVS_CHECK_DPDK], [
     OVS_LDFLAGS="$OVS_LDFLAGS -L$DPDK_LIB_DIR"
     OVS_CFLAGS="$OVS_CFLAGS -I$DPDK_INCLUDE"
 
-    # DPDK 1.7.0 pmd drivers are not linked unless --whole-archive is used.
+    # DPDK 1.7 pmd drivers are not linked unless --whole-archive is used.
     #
     # This happens because the rest of the DPDK code doesn't use any symbol in
     # the pmd driver objects, and the drivers register themselves using an