From: Christian Trautman <ctrautma@redhat.com>
Date: Mon, 5 Sep 2016 06:42:19 +0000 (-0400)
Subject: Updated armband
X-Git-Tag: danube.1.RC1~145
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1efd72febdd208d4dee9e1fb000493d837febb71;p=armband.git

Updated armband
Project: vswitchperf  a325eb33fbe408243209b19f2d9cc288b2e57548

merge_buffers: Add option to disable merge buffer on qemu startup

In cases with VHost user and non-jumbo frame scenarios we can
disable merge buffers on the guest NICS to improve performance.
This patch adds this option to the 04_vnf conf file.

JIRA: VSPERF-388

Change-Id: Ic1f776e90fdccaa5d5a0c952c96811a8747fe936
Signed-off-by: Christian Trautman <ctrautma@redhat.com>
---

diff --git a/upstream/vswitchperf b/upstream/vswitchperf
index acdb444a..a325eb33 160000
--- a/upstream/vswitchperf
+++ b/upstream/vswitchperf
@@ -1 +1 @@
-Subproject commit acdb444a54124834acdde45107062eaf1452c119
+Subproject commit a325eb33fbe408243209b19f2d9cc288b2e57548