Merge "Free the flow metadata post a flush" into R2.0

Juniper · Apr 4, 2015 · 3a8819e · 3a8819e
2 parents 9dada8a + 225b4e7
commit 3a8819e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/dp-core/vr_flow.c b/dp-core/vr_flow.c
@@ -1303,11 +1303,11 @@ vr_flow_flush(void *arg)
 
     router = flmd->flmd_router;
     if (!router)
-        return;
+        goto exit_flush;
 
     fe = vr_get_flow_entry(router, flmd->flmd_index);
     if (!fe)
-        return;
+        goto exit_flush;
 
     vr_init_forwarding_md(&fmd);
     vr_flow_set_forwarding_md(router, fe, flmd->flmd_index, &fmd);
@@ -1318,6 +1318,9 @@ vr_flow_flush(void *arg)
         vr_reset_flow_entry(router, fe, flmd->flmd_index);
     } 
 
+exit_flush:
+    vr_free(flmd);
+
     return;
 }