return count;
}
-static int do_delete(struct sw_table *swt, struct sw_flow *flow)
+static int do_delete(struct datapath *dp, struct sw_table *swt,
+ struct sw_flow *flow, enum nx_flow_end_reason reason)
{
+ dp_send_flow_end(dp, flow, reason);
list_del_rcu(&flow->node);
list_del_rcu(&flow->iter_node);
flow_deferred_free(flow);
return 1;
}
-static int table_linear_delete(struct sw_table *swt,
- const struct sw_flow_key *key, uint16_t priority, int strict)
+static int table_linear_delete(struct datapath *dp, 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;
struct sw_flow *flow;
list_for_each_entry (flow, &tl->flows, node) {
if (flow_matches_desc(&flow->key, key, strict)
+ && flow_has_out_port(flow, out_port)
&& (!strict || (flow->priority == priority)))
- count += do_delete(swt, flow);
+ count += do_delete(dp, swt, flow, NXFER_DELETE);
}
tl->n_flows -= count;
return count;
list_for_each_entry (flow, &tl->flows, node) {
int reason = flow_timeout(flow);
if (reason >= 0) {
- count += do_delete(swt, flow);
- dp_send_flow_expired(dp, flow, reason);
+ count += do_delete(dp, swt, flow, reason);
}
}
tl->n_flows -= count;
}
static int table_linear_iterate(struct sw_table *swt,
- const struct sw_flow_key *key,
+ const struct sw_flow_key *key, uint16_t out_port,
struct sw_table_position *position,
int (*callback)(struct sw_flow *, void *),
void *private)
start = position->private[0];
list_for_each_entry (flow, &tl->iter_flows, iter_node) {
if (flow->serial >= start
- && flow_matches_2wild(key, &flow->key)) {
+ && 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;