mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 01:40:30 +00:00
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>
This commit is contained in:
parent
9261921052
commit
a277d516de
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user