From: Ben Pfaff <blp@nicira.com>
Date: Mon, 30 Sep 2013 21:46:50 +0000 (-0700)
Subject: flow: Fill in ->l7 in flow_compose().
X-Git-Tag: sliver-openvswitch-2.0.90-1~6^2~22
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b322d9baed50aae3cb0523b0537524da6cd7e769;p=sliver-openvswitch.git

flow: Fill in ->l7 in flow_compose().

flow_extract() fills in ->l7 but flow_compose() wasn't doing it, which
confused bfd_process_packet() when invoked via the ofproto/trace appctl
command.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/flow.c b/lib/flow.c
index 31fd07cba..8c336f6d4 100644
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -1066,6 +1066,7 @@ flow_compose(struct ofpbuf *b, const struct flow *flow)
                 icmp->icmp_code = ntohs(flow->tp_dst);
                 icmp->icmp_csum = csum(icmp, ICMP_HEADER_LEN);
             }
+            b->l7 = ofpbuf_tail(b);
         }
 
         ip = b->l3;