From: gureedo <gureedo@intersvyaz.net>
Date: Mon, 21 Mar 2016 09:38:53 +0000 (+0500)
Subject: netmap: remove workers zero copy mode restriction between interfaces
X-Git-Tag: suricata-3.0.1RC1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f891aadefc910354362144870d3f10387274e967;p=thirdparty%2Fsuricata.git

netmap: remove workers zero copy mode restriction between interfaces
Rationale: https://github.com/luigirizzo/netmap/issues/126
---

diff --git a/src/source-netmap.c b/src/source-netmap.c
index 061635b647..f5b82e276e 100644
--- a/src/source-netmap.c
+++ b/src/source-netmap.c
@@ -632,14 +632,9 @@ static TmEcode ReceiveNetmapThreadInit(ThreadVars *tv, void *initdata, void **da
     char const *active_runmode = RunmodeGetActive();
     if ((aconf->copy_mode != NETMAP_COPY_MODE_NONE) && active_runmode
             && !strcmp("workers", active_runmode)) {
-        if (likely(ntv->ifsrc->mem == ntv->ifdst->mem)) {
-            ntv->flags |= NETMAP_FLAG_ZERO_COPY;
-            SCLogInfo("Enabling zero copy mode for %s->%s",
-                      aconf->iface_name, aconf->out_iface_name);
-        } else {
-            SCLogInfo("Unable to set zero copy mode for %s->%s",
-                      aconf->iface_name, aconf->out_iface_name);
-        }
+        ntv->flags |= NETMAP_FLAG_ZERO_COPY;
+        SCLogInfo("Enabling zero copy mode for %s->%s",
+                  aconf->iface_name, aconf->out_iface_name);
     }
 
     if (aconf->bpf_filter) {