Commit 465073e4 authored Nov 02, 2018 by Arnd Bergmann Committed by Greg Kroah-Hartman Dec 01, 2019

openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS



[ Upstream commit a277d516de5f498c91d91189717ef7e01102ad27 ]

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 <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 31bced01

net/openvswitch/conntrack.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1199,7 +1199,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)