TUNNEL_OPTIONS_PRESENT should always be checked against the tun_flgs bits in a flow key, for both flow and mask serialization.
Signed-off-by: Andy Zhou <az...@nicira.com> --- datapath/flow_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index a3f34f1..35feedc 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -1122,7 +1122,7 @@ int ovs_nla_put_flow(const struct sw_flow_key *swkey, if ((swkey->tun_key.ipv4_dst || is_mask)) { const struct geneve_opt *opts = NULL; - if (output->tun_key.tun_flags & TUNNEL_OPTIONS_PRESENT) + if (swkey->tun_key.tun_flags & TUNNEL_OPTIONS_PRESENT) opts = GENEVE_OPTS(output, swkey->tun_opts_len); if (ipv4_tun_to_nlattr(skb, &output->tun_key, opts, -- 1.9.1 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev