Apologies for the delay.
I applied this to master and branch-2.5 with the following incremental,
to remove a deprecation warning:
diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
index de7e488..31e56b6 100644
--- a/lib/netdev-dpdk.c
+++ b/lib/netdev-dpdk.c
@@ -1480,9 +1480,9 @@ netdev_dpdk_get_stats(const struct netdev *netdev,
struct netdev_stats *stats)
stats->rx_dropped = rte_stats.rx_nombuf + rte_stats.imissed;
stats->collisions = UINT64_MAX;
- stats->rx_length_errors = rte_stats.ibadlen;
+ stats->rx_length_errors = UINT64_MAX;
stats->rx_over_errors = UINT64_MAX;
- stats->rx_crc_errors = rte_stats.ibadcrc;
+ stats->rx_crc_errors = UINT64_MAX;
stats->rx_frame_errors = UINT64_MAX;
stats->rx_fifo_errors = UINT64_MAX;
stats->rx_missed_errors = rte_stats.imissed;
Thanks
On 07/01/2016 08:47, "Ben Pfaff" <[email protected]> wrote:
>I agree that the patch should get reviewed (I'm the wrong person), but
>it's not just a documentation update; it actually changes the CI build
>to use DPDK 2.2.0.
>
>On Thu, Jan 07, 2016 at 09:06:17AM +0000, Weglicki, MichalX wrote:
>> Hello,
>>
>> Is it possible to merge this patch? It is just documentation update
>>about dpdk2.2.
>>
>> Br,
>> Michal.
>>
>> -----Original Message-----
>> From: Weglicki, MichalX
>> Sent: Wednesday, December 23, 2015 10:20 AM
>> To: [email protected]
>> Cc: Weglicki, MichalX <[email protected]>
>> Subject: [PATCH] Update relevant artifacts to add support for DPDK
>>v2.2.0.
>>
>> Following changes have been applied:
>> - INSTALL.DPDK.md: change DPDK version number,
>> - build.sh: change DPDK version number.
>>
>> Signed-off-by: Michal Weglicki <[email protected]>
>> ---
>> .travis/build.sh | 2 +-
>> INSTALL.DPDK.md | 10 +++++-----
>> 2 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/.travis/build.sh b/.travis/build.sh
>> index 1b7aaac..4df618b 100755
>> --- a/.travis/build.sh
>> +++ b/.travis/build.sh
>> @@ -69,7 +69,7 @@ fi
>>
>> if [ "$DPDK" ]; then
>> if [ -z "$DPDK_VER" ]; then
>> - DPDK_VER="2.1.0"
>> + DPDK_VER="2.2.0"
>> fi
>> install_dpdk $DPDK_VER
>> if [ "$CC" = "clang" ]; then
>> diff --git a/INSTALL.DPDK.md b/INSTALL.DPDK.md
>> index 96b686c..c601358 100644
>> --- a/INSTALL.DPDK.md
>> +++ b/INSTALL.DPDK.md
>> @@ -16,7 +16,7 @@ OVS needs a system with 1GB hugepages support.
>> Building and Installing:
>> ------------------------
>>
>> -Required: DPDK 2.1
>> +Required: DPDK 2.2
>> Optional (if building with vhost-cuse): `fuse`, `fuse-devel`
>>(`libfuse-dev`
>> on Debian/Ubuntu)
>>
>> @@ -24,7 +24,7 @@ on Debian/Ubuntu)
>> 1. Set `$DPDK_DIR`
>>
>> ```
>> - export DPDK_DIR=/usr/src/dpdk-2.1
>> + export DPDK_DIR=/usr/src/dpdk-2.2
>> cd $DPDK_DIR
>> ```
>>
>> @@ -473,7 +473,7 @@ the vswitchd.
>> DPDK vhost:
>> -----------
>>
>> -DPDK 2.1 supports two types of vhost:
>> +DPDK 2.2 supports two types of vhost:
>>
>> 1. vhost-user
>> 2. vhost-cuse
>> @@ -494,7 +494,7 @@ with OVS.
>> DPDK vhost-user Prerequisites:
>> -------------------------
>>
>> -1. DPDK 2.1 with vhost support enabled as documented in the "Building
>>and
>> +1. DPDK 2.2 with vhost support enabled as documented in the "Building
>>and
>> Installing section"
>>
>> 2. QEMU version v2.1.0+
>> @@ -576,7 +576,7 @@ with OVS.
>> DPDK vhost-cuse Prerequisites:
>> -------------------------
>>
>> -1. DPDK 2.1 with vhost support enabled as documented in the "Building
>>and
>> +1. DPDK 2.2 with vhost support enabled as documented in the "Building
>>and
>> Installing section"
>> As an additional step, you must enable vhost-cuse in DPDK by
>>setting the
>> following additional flag in `config/common_linuxapp`:
>> --
>> 1.9.3
>>
>> --------------------------------------------------------------
>> Intel Research and Development Ireland Limited
>> Registered in Ireland
>> Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
>> Registered Number: 308263
>>
>>
>> This e-mail and any attachments may contain confidential material for
>>the sole
>> use of the intended recipient(s). Any review or distribution by others
>>is
>> strictly prohibited. If you are not the intended recipient, please
>>contact the
>> sender and delete all copies.
>>
>> _______________________________________________
>> dev mailing list
>> [email protected]
>> http://openvswitch.org/mailman/listinfo/dev
>_______________________________________________
>dev mailing list
>[email protected]
>http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
