On 6 December 2015 at 00:42, Simon Horman <simon.hor...@netronome.com> wrote: > Hi Joe, > > On Wed, Dec 02, 2015 at 11:53:52PM -0800, Joe Stringer wrote: >> From: Joe Stringer <joestrin...@nicira.com> >> >> Allow matching and setting the ct_label field. As with ct_mark, this is >> populated by executing the CT action. The label field may be modified by >> specifying a label and mask nested under the CT action. It is stored as >> metadata attached to the connection. Label modification occurs after >> lookup, and will only persist when the conntrack entry is committed by >> providing the COMMIT flag to the CT action. Labels are currently fixed >> to 128 bits in size. >> >> Upstream: c2ac667 "openvswitch: Allow matching on conntrack label" >> Signed-off-by: Joe Stringer <joestrin...@nicira.com> > > [snip] > >> +void ovs_ct_exit(struct net *net) >> +{ >> + struct ovs_net *ovs_net = net_generic(net, ovs_net_id); >> + >> + if (ovs_net->xt_label) >> + nf_connlabels_put(net); >> +} >> + >> #endif /* CONFIG_NF_CONNTRACK && LINUX > 3.9 */ > > It appears that the above code is compiled if the conditions on > the line above are met. However, below nf_connlabels_put compatibility > code is compiled for a different set of conditions. > > I have observed a build failure due to nf_connlabels_put() being > undefined when compiling against v4.2.6 with NF_CONNTRACK but not > NF_CONNTRACK_LABELS enabled.
Thanks for the report Simon, I will send a patch to add empty versions to the header in #else case. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev