Fix "make dist" by adding forgotten files to sources lists.

[sliver-openvswitch.git] / switch / table-linear.c

diff --git a/switch/table-linear.c b/switch/table-linear.c
index 9a7a06c..1ec6951 100644 (file)
--- a/switch/table-linear.c
+++ b/switch/table-linear.c
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include "flow.h"
 #include "list.h"
-#include "openflow.h"
+#include "openflow/openflow.h"
 #include "switch-flow.h"
 #include "datapath.h"
 
@@ -102,7 +102,7 @@ static int table_linear_insert(struct sw_table *swt, struct sw_flow *flow)
 
 static int table_linear_modify(struct sw_table *swt,
                 const struct sw_flow_key *key, uint16_t priority, int strict,
-                const struct ofp_action *actions, int n_actions)
+                const struct ofp_action_header *actions, size_t actions_len)
 {
     struct sw_table_linear *tl = (struct sw_table_linear *) swt;
     struct sw_flow *flow;
@@ -111,7 +111,7 @@ static int table_linear_modify(struct sw_table *swt,
     LIST_FOR_EACH (flow, struct sw_flow, node, &tl->flows) {
         if (flow_matches_desc(&flow->key, key, strict)
                 && (!strict || (flow->priority == priority))) {
-            flow_replace_acts(flow, actions, n_actions);
+            flow_replace_acts(flow, actions, actions_len);
             count++;
         }
     }
@@ -128,6 +128,7 @@ do_delete(struct sw_flow *flow)
 
 static int table_linear_delete(struct sw_table *swt,
                                const struct sw_flow_key *key, 
+                               uint16_t out_port,
                                uint16_t priority, int strict)
 {
     struct sw_table_linear *tl = (struct sw_table_linear *) swt;
@@ -136,6 +137,7 @@ static int table_linear_delete(struct sw_table *swt,
 
     LIST_FOR_EACH_SAFE (flow, n, struct sw_flow, node, &tl->flows) {
         if (flow_matches_desc(&flow->key, key, strict)
+                && flow_has_out_port(flow, out_port)
                 && (!strict || (flow->priority == priority))) {
             do_delete(flow);
             count++;
@@ -175,6 +177,7 @@ static void table_linear_destroy(struct sw_table *swt)
 
 static int table_linear_iterate(struct sw_table *swt,
                                 const struct sw_flow_key *key,
+                                uint16_t out_port,
                                 struct sw_table_position *position,
                                 int (*callback)(struct sw_flow *, void *),
                                 void *private)
@@ -185,7 +188,9 @@ static int table_linear_iterate(struct sw_table *swt,
 
     start = ~position->private[0];
     LIST_FOR_EACH (flow, struct sw_flow, iter_node, &tl->iter_flows) {
-        if (flow->serial <= start && flow_matches_2wild(key, &flow->key)) {
+        if (flow->serial <= start 
+                && flow_matches_2wild(key, &flow->key)
+                && flow_has_out_port(flow, out_port)) {
             int error = callback(flow, private);
             if (error) {
                 position->private[0] = ~(flow->serial - 1);
@@ -204,6 +209,7 @@ static void table_linear_stats(struct sw_table *swt,
     stats->wildcards = OFPFW_ALL;
     stats->n_flows   = tl->n_flows;
     stats->max_flows = tl->max_flows;
+    stats->n_lookup  = swt->n_lookup;
     stats->n_matched = swt->n_matched;
 }