]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Nov 2018 15:36:55 +0000 (16:36 +0100)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Fri, 17 Jan 2020 17:21:01 +0000 (14:21 -0300)
commit270bf16d464f064753c303690082a5eb46325c33
tree3ea42019954b610bea23ca7cb855bddee0928902
parent6255133dc1daf4d46ac2fa8751d46cec221c31dd
openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS

BugLink: https://bugs.launchpad.net/bugs/1854975
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
net/openvswitch/conntrack.c