diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-10-15 10:27:42 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-10-18 10:55:39 -0700 |
| commit | 719197e73bac15656374af48a0f86b79d9eaea34 (patch) | |
| tree | 8437e877fa1d51a654bdbc30f357e9749ebb8992 /datapath | |
| parent | efcae7df6c9f43ac542e13f687d03f8c698c181f (diff) | |
| download | openvswitch-719197e73bac15656374af48a0f86b79d9eaea34.tar.gz | |
datapath: Fix linking without CONFIG_NF_CONNTRACK_LABELS
upstream commit:
commit a277d516de5f498c91d91189717ef7e01102ad27
Author: Arnd Bergmann <arnd@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 <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/conntrack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index c6d523758..e328afe1a 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) |