| Message ID | 20181102153705.1664786-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | a277d516de5f498c91d91189717ef7e01102ad27 |
| Headers | show |
| Series | openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS | expand |
From: Arnd Bergmann <arnd@arndb.de> Date: Fri, 2 Nov 2018 16:36:55 +0100 > 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> Applied, thanks Arnd.
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)
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> --- net/openvswitch/conntrack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.18.0