aboutsummaryrefslogtreecommitdiff
path: root/ofproto
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2013-05-12 14:53:51 -0700
committerEthan Jackson <ethan@nicira.com>2013-05-13 11:37:24 -0700
commitaf6c3da2b15d958f8757c9b5110370bc4e16a78c (patch)
tree09df1f833425a0bc8775238b62c23173cc518f02 /ofproto
parentcda2457fa33533fabc882fbea64ea0427346aa96 (diff)
ofproto-dpif: Make fin_timeout work when governor kicks in.
The xlate_actions() call in handle_flow_miss_without_facet() didn't implement fin_timeout properly because tcp_flags wasn't getting set. I have not tested that this fixes the problem, but it seems "obviously correct". Bug #16506. Reported-by: Ying Chen <yingchen@vmware.com> Signed-off-by: Ben Pfaff <blp@nicira.com> Signed-off-by: Ethan Jackson <ethan@nicira.com> Acked-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'ofproto')
-rw-r--r--ofproto/ofproto-dpif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 4bc66158..a3b1153b 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3629,8 +3629,8 @@ handle_flow_miss_without_facet(struct flow_miss *miss,
dpif_flow_stats_extract(&miss->flow, packet, now, &stats);
rule_credit_stats(rule, &stats);
- action_xlate_ctx_init(&ctx, ofproto, &miss->flow,
- &miss->initial_vals, rule, 0, packet);
+ action_xlate_ctx_init(&ctx, ofproto, &miss->flow, &miss->initial_vals,
+ rule, stats.tcp_flags, packet);
ctx.resubmit_stats = &stats;
xlate_actions(&ctx, rule->up.ofpacts, rule->up.ofpacts_len,
&odp_actions);