Skip to content

Commit 7fb668a

Browse files
Jarno Rajahalmeummakynes
authored andcommitted
netfilter: nf_ct_expect: nf_ct_expect_related_report(): Return zero on success.
Commit 4dee62b ("netfilter: nf_ct_expect: nf_ct_expect_insert() returns void") inadvertently changed the successful return value of nf_ct_expect_related_report() from 0 to 1, which caused openvswitch conntrack integration fail in FTP test cases. Fix this by always returning zero on the success code path. Fixes: 4dee62b ("netfilter: nf_ct_expect: nf_ct_expect_insert() returns void") Signed-off-by: Jarno Rajahalme <[email protected]> Acked-by: Joe Stringer <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent f216827 commit 7fb668a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/netfilter/nf_conntrack_expect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ int nf_ct_expect_related_report(struct nf_conntrack_expect *expect,
467467

468468
spin_unlock_bh(&nf_conntrack_expect_lock);
469469
nf_ct_expect_event_report(IPEXP_NEW, expect, portid, report);
470-
return ret;
470+
return 0;
471471
out:
472472
spin_unlock_bh(&nf_conntrack_expect_lock);
473473
return ret;

0 commit comments

Comments
 (0)