From f891aadefc910354362144870d3f10387274e967 Mon Sep 17 00:00:00 2001 From: gureedo Date: Mon, 21 Mar 2016 14:38:53 +0500 Subject: [PATCH] netmap: remove workers zero copy mode restriction between interfaces Rationale: https://github.com/luigirizzo/netmap/issues/126 --- src/source-netmap.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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) { -- 2.47.2