Merge tag 'nfc-next-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...

[mirror_ubuntu-hirsute-kernel.git] / include / net / netfilter / nf_conntrack_l4proto.h

diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 956d8a6ac06935bc151a74ead1090268378eff70..1a5fb36f165fd699e93a52c186f65a14615d0f42 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -23,6 +23,9 @@ struct nf_conntrack_l4proto {
        /* L4 Protocol number. */
        u_int8_t l4proto;
 
+       /* Resolve clashes on insertion races. */
+       bool allow_clash;
+
        /* Try to fill in the third arg: dataoff is offset past network protocol
            hdr.  Return true if possible. */
        bool (*pkt_to_tuple)(const struct sk_buff *skb, unsigned int dataoff,