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)