Merge "Before initiating eviction, wait for the reverse flow to move …

…from HOLD" into R3.0
Juniper · May 8, 2016 · b2d164c · b2d164c
2 parents 9cf435f + 8e7127d
commit b2d164c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/dp-core/vr_flow.c b/dp-core/vr_flow.c
@@ -689,7 +689,9 @@ vr_flow_mark_evict(struct vrouter *router, struct vr_flow_entry *fe,
                     /* no modification. hence...*/
                     rfe = NULL;
                 } else {
-                    if ((rfe->fe_rflow == index) || (rfe->fe_rflow < 0)) {
+                    /* we do not want hold flows to be evicted, just yet */
+                    if (((rfe->fe_rflow == index) || (rfe->fe_rflow < 0)) &&
+                            (rfe->fe_action != VR_FLOW_ACTION_HOLD)) {
                         evict_forward_flow = __vr_flow_mark_evict(router, rfe);
                     }
                 }

diff --git a/dp-core/vrouter.c b/dp-core/vrouter.c
@@ -262,6 +262,8 @@ vrouter_ops_destroy(vrouter_ops *req)
         req->vo_build_info = NULL;
     }
 
+    vr_free(req, VR_VROUTER_REQ_OBJECT);
+
     return;
 }