Add support for OFPFC_MODIFY Flow Mod command.

[openvswitch] / datapath / table-linear.c

diff --git a/datapath/table-linear.c b/datapath/table-linear.c
index e7c6e673902e6b9d0e05db20d9bbc676dc18c460..4a10df550373a2cee35d84734a66404218d74f32 100644 (file)
--- a/datapath/table-linear.c
+++ b/datapath/table-linear.c
@@ -48,6 +48,11 @@ static int table_linear_insert(struct sw_table *swt, struct sw_flow *flow)
                if (f->priority == flow->priority
                                && f->key.wildcards == flow->key.wildcards
                                && flow_matches_2wild(&f->key, &flow->key)) {
+                       /* Keep stats from the original flow */
+                       flow->init_time = f->init_time;
+                       flow->packet_count = f->packet_count;
+                       flow->byte_count = f->byte_count;
+
                        flow->serial = f->serial;
                        list_replace_rcu(&f->node, &flow->node);
                        list_replace_rcu(&f->iter_node, &flow->iter_node);
@@ -72,6 +77,23 @@ static int table_linear_insert(struct sw_table *swt, struct sw_flow *flow)
        return 1;
 }
 
+static int table_linear_modify(struct sw_table *swt,
+                               const struct sw_flow_key *key,
+                               const struct ofp_action *actions, int n_actions)
+{
+       struct sw_table_linear *tl = (struct sw_table_linear *) swt;
+       struct sw_flow *flow;
+       unsigned int count = 0;
+
+       list_for_each_entry (flow, &tl->flows, node) {
+               if (flow_matches_1wild(&flow->key, key)) {
+                       flow_replace_acts(flow, actions, n_actions);
+                       count++;
+               }
+       }
+       return count;
+}
+
 static int do_delete(struct sw_table *swt, struct sw_flow *flow) 
 {
        list_del_rcu(&flow->node);
@@ -157,7 +179,8 @@ static void table_linear_stats(struct sw_table *swt,
 {
        struct sw_table_linear *tl = (struct sw_table_linear *) swt;
        stats->name = "linear";
-       stats->n_flows = tl->n_flows;
+       stats->wildcards = OFPFW_ALL;
+       stats->n_flows   = tl->n_flows;
        stats->max_flows = tl->max_flows;
        stats->n_matched = swt->n_matched;
 }
@@ -175,6 +198,7 @@ struct sw_table *table_linear_create(unsigned int max_flows)
        swt = &tl->swt;
        swt->lookup = table_linear_lookup;
        swt->insert = table_linear_insert;
+       swt->modify = table_linear_modify;
        swt->delete = table_linear_delete;
        swt->timeout = table_linear_timeout;
        swt->destroy = table_linear_destroy;