openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Nov 2018 15:36:55 +0000 (16:36 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sun, 4 Nov 2018 02:28:44 +0000 (19:28 -0700)
commita277d516de5f498c91d91189717ef7e01102ad27
tree34d6fb1b74929733e3367ff43a7166edef443c47
parent92619210529a6b77b2cbedbadba3ff5eaa6e28ed
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 <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/openvswitch/conntrack.c