From 4d698e25870723fcb7365b5c1ea4cd9a7bf38933 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 12 May 2013 14:53:51 -0700 Subject: [PATCH] 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 Signed-off-by: Ben Pfaff Signed-off-by: Ethan Jackson Acked-by: Ethan Jackson --- AUTHORS | 1 + ofproto/ofproto-dpif.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index dd3a24014..93f9b1aab 100644 --- a/AUTHORS +++ b/AUTHORS @@ -178,6 +178,7 @@ Vishal Swarankar vishal.swarnkar@gmail.com Vjekoslav Brajkovic balkan@cs.washington.edu Voravit T. voravit@kth.se YAMAMOTO Takashi yamamoto@valinux.co.jp +Ying Chen yingchen@vmware.com Yongqiang Liu liuyq7809@gmail.com kk yap yapkke@stanford.edu likunyun kunyunli@hotmail.com diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index ef4f50027..c37a26531 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -2887,7 +2887,7 @@ handle_flow_miss_without_facet(struct flow_miss *miss, rule_credit_stats(rule, &stats); action_xlate_ctx_init(&ctx, ofproto, &miss->flow, miss->initial_tci, - rule, 0, packet); + rule, stats.tcp_flags, packet); ctx.resubmit_stats = &stats; xlate_actions(&ctx, rule->up.ofpacts, rule->up.ofpacts_len, &odp_actions); -- 2.20.1