source-pfring: don't set cluster mode when using ZC and VLAN tracking is disabled

diff --git a/src/source-pfring.c b/src/source-pfring.c
index 84fe0df6156830494716228a8717e7e261747967..3b2b52df23e0a710f07704a5e87eba929d68af3a 100644 (file)
--- a/src/source-pfring.c
+++ b/src/source-pfring.c
@@ -517,8 +517,10 @@ TmEcode ReceivePfringThreadInit(ThreadVars *tv, void *initdata, void **data)
         ptv->vlan_disabled = 1;
     }
 
-    /* Since VLAN is disabled we force the cluster type to CLUSTER_FLOW_5_TUPLE */
-    if (ptv->vlan_disabled == 1 && ptv->ctype == CLUSTER_FLOW) {
+    /* If VLAN tracking is disabled, set cluster type to 5-tuple or in case of a
+     * ZC interface, do nothing */
+    if (ptv->vlan_disabled && ptv->ctype == CLUSTER_FLOW &&
+            strncmp(ptv->interface, "zc", 2) != 0) {
         SCLogInfo("VLAN disabled, setting cluster type to CLUSTER_FLOW_5_TUPLE");
         rc = pfring_set_cluster(ptv->pd, ptv->cluster_id, CLUSTER_FLOW_5_TUPLE);