diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-11-02 16:36:55 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-03 19:28:44 -0700 |
| commit | a277d516de5f498c91d91189717ef7e01102ad27 (patch) | |
| tree | 34d6fb1b74929733e3367ff43a7166edef443c47 /net/openvswitch | |
| parent | qed: fix link config error handling (diff) | |
| download | linux-dev-a277d516de5f498c91d91189717ef7e01102ad27.tar.xz linux-dev-a277d516de5f498c91d91189717ef7e01102ad27.zip | |
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>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/conntrack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 6bec37ab4472..a4660c48ff01 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -1203,7 +1203,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) |