diff options
| author | Justin Pettit <jpettit@nicira.com> | 2013-02-19 11:42:54 -0800 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2013-03-06 13:49:02 -0800 |
| commit | 6159be7cf661e74ff0428b885e56e52ed4944b40 (patch) | |
| tree | 2ed43961c657652d07472700fe10ecb161c592d3 /ofproto | |
| parent | 2b0a8f8f665c499ad52e08c8d1b3cd1b71233b21 (diff) | |
ofproto-dpif: Pass around "facet" in flow_push_stats().
The flow_push_stats() function will need other members of the "facet"
structure in a future commit.
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'ofproto')
| -rw-r--r-- | ofproto/ofproto-dpif.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index b1ae92eb..134051d0 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -79,6 +79,7 @@ BUILD_ASSERT_DECL(N_TABLES >= 2 && N_TABLES <= 255); struct ofport_dpif; struct ofproto_dpif; struct flow_miss; +struct facet; struct rule_dpif { struct rule up; @@ -119,8 +120,7 @@ static struct rule_dpif *rule_dpif_miss_rule(struct ofproto_dpif *ofproto, static void rule_credit_stats(struct rule_dpif *, const struct dpif_flow_stats *); -static void flow_push_stats(struct rule_dpif *, const struct flow *, - const struct dpif_flow_stats *); +static void flow_push_stats(struct facet *, const struct dpif_flow_stats *); static tag_type rule_calculate_tag(const struct flow *, const struct minimask *, uint32_t basis); static void rule_invalidate(const struct rule_dpif *); @@ -4905,7 +4905,7 @@ facet_push_stats(struct facet *facet) facet->prev_byte_count = facet->byte_count; facet->prev_used = facet->used; - flow_push_stats(facet->rule, &facet->flow, &stats); + flow_push_stats(facet, &stats); update_mirror_stats(ofproto_dpif_cast(facet->rule->up.ofproto), facet->mirrors, stats.n_packets, stats.n_bytes); @@ -4920,19 +4920,19 @@ rule_credit_stats(struct rule_dpif *rule, const struct dpif_flow_stats *stats) ofproto_rule_update_used(&rule->up, stats->used); } -/* Pushes flow statistics to the rules which 'flow' resubmits into given - * 'rule''s actions and mirrors. */ +/* Pushes flow statistics to the rules which 'facet->flow' resubmits + * into given 'facet->rule''s actions and mirrors. */ static void -flow_push_stats(struct rule_dpif *rule, - const struct flow *flow, const struct dpif_flow_stats *stats) +flow_push_stats(struct facet *facet, const struct dpif_flow_stats *stats) { + struct rule_dpif *rule = facet->rule; struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); struct action_xlate_ctx ctx; ofproto_rule_update_used(&rule->up, stats->used); - action_xlate_ctx_init(&ctx, ofproto, flow, flow->vlan_tci, rule, - 0, NULL); + action_xlate_ctx_init(&ctx, ofproto, &facet->flow, facet->flow.vlan_tci, + rule, 0, NULL); ctx.resubmit_stats = stats; xlate_actions_for_side_effects(&ctx, rule->up.ofpacts, rule->up.ofpacts_len); |