Skip to content

Commit 980b2ba

Browse files
committed
Merge: openvswitch: get related ct labels from its master if it is not confirmed
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4535 JIRA: https://issues.redhat.com/browse/RHEL-44560 Tested: compile only Signed-off-by: Xin Long <lxin@redhat.com> Approved-by: Florian Westphal <fwestpha@redhat.com> Approved-by: Antoine Tenart <atenart@redhat.com> Approved-by: Aaron Conole <aconole@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents fe84f7a + 08cd1c3 commit 980b2ba

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

net/openvswitch/conntrack.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,13 @@ static u32 ovs_ct_get_mark(const struct nf_conn *ct)
167167
static void ovs_ct_get_labels(const struct nf_conn *ct,
168168
struct ovs_key_ct_labels *labels)
169169
{
170-
struct nf_conn_labels *cl = ct ? nf_ct_labels_find(ct) : NULL;
170+
struct nf_conn_labels *cl = NULL;
171171

172+
if (ct) {
173+
if (ct->master && !nf_ct_is_confirmed(ct))
174+
ct = ct->master;
175+
cl = nf_ct_labels_find(ct);
176+
}
172177
if (cl)
173178
memcpy(labels, cl->bits, OVS_CT_LABELS_LEN);
174179
else

0 commit comments

Comments
 (0)