LGTM.
Reviewed-by: Yifeng Sun <pkusunyif...@gmail.com>
On Tue, Oct 15, 2019 at 10:40 AM Yi-Hung Wei <yihung....@gmail.com> wrote:
>
> From: Arnd Bergmann <a...@arndb.de>
>
> upstream commit:
> commit a277d516de5f498c91d91189717ef7e01102ad27
> Author: Arnd Bergmann <a...@arndb.de>
> Date: Fri Nov 2 16:36:55 2018 +0100
>
> openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS
>
> When CONFIG_CC_OPTIMIZE_FOR_DEBUGGING is enabled, the compiler
> fails to optimize out a dead code path, which leads to a link failure:
>
> net/openvswitch/conntrack.o: In function `ovs_ct_set_labels':
> conntrack.c:(.text+0x2e60): undefined reference to `nf_connlabels_replace'
>
> In this configuration, we can take a shortcut, and completely
> remove the contrack label code. This may also help the regular
> optimization.
>
> Signed-off-by: Arnd Bergmann <a...@arndb.de>
> Signed-off-by: David S. Miller <da...@davemloft.net>
>
> Signed-off-by: Yi-Hung Wei <yihung....@gmail.com>
> ---
> datapath/conntrack.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/datapath/conntrack.c b/datapath/conntrack.c
> index c6d523758ff1..e328afe1ad15 100644
> --- a/datapath/conntrack.c
> +++ b/datapath/conntrack.c
> @@ -1263,7 +1263,8 @@ static int ovs_ct_commit(struct net *net, struct
> sw_flow_key *key,
> &info->labels.mask);
> if (err)
> return err;
> - } else if (labels_nonzero(&info->labels.mask)) {
> + } else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) &&
> + labels_nonzero(&info->labels.mask)) {
> err = ovs_ct_set_labels(ct, key, &info->labels.value,
> &info->labels.mask);
> if (err)
> --
> 2.7.4
>
> _______________________________________________
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
