From: Justin Pettit <jpettit@nicira.com>
Date: Sat, 13 Sep 2008 01:50:37 +0000 (-0700)
Subject: Clean up the code in the sample hardware table code.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1d51f75c4944307548f240f0a13255570a92bf3;p=openvswitch

Clean up the code in the sample hardware table code.
---

diff --git a/datapath/hwtable_dummy/hwtable_dummy.c b/datapath/hwtable_dummy/hwtable_dummy.c
index 20f72a29..e3e0eb41 100644
--- a/datapath/hwtable_dummy/hwtable_dummy.c
+++ b/datapath/hwtable_dummy/hwtable_dummy.c
@@ -105,6 +105,7 @@ static int do_delete(struct sw_table *swt, struct sw_flow *flow)
 	 */
 	list_del_rcu(&flow->node);
 	list_del_rcu(&flow->iter_node);
+	flow_deferred_free(flow);
 	return 1;
 }
 
@@ -190,12 +191,12 @@ static int table_dummy_iterate(struct sw_table *swt,
 			       int (*callback)(struct sw_flow *, void *),
 			       void *private)
 {
-	struct sw_table_dummy *tl = (struct sw_table_dummy *) swt;
+	struct sw_table_dummy *td = (struct sw_table_dummy *) swt;
 	struct sw_flow *flow;
 	unsigned long start;
 
 	start = ~position->private[0];
-	list_for_each_entry (flow, &tl->iter_flows, iter_node) {
+	list_for_each_entry (flow, &td->iter_flows, iter_node) {
 		if (flow->serial <= start && flow_matches_2wild(key,
 								&flow->key)) {
 			int error = callback(flow, private);