diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-02-11 04:29:56 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-02-11 04:29:56 +0300 |
commit | 5b91c5cc0e7be4e41567cb2a6e21a8bb682c7cc5 (patch) | |
tree | ed284edec0db783dfa80366ae8df078b02f35be9 /include/uapi/linux/netfilter | |
parent | 4f5e483b8c7a644733db941a1ae00173baa7b463 (diff) | |
parent | f1baf68e1383f6ed93eb9cff2866d46562607a43 (diff) | |
download | linux-5b91c5cc0e7be4e41567cb2a6e21a8bb682c7cc5.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/uapi/linux/netfilter')
-rw-r--r-- | include/uapi/linux/netfilter/nf_conntrack_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h index 4b3395082d15..26071021e986 100644 --- a/include/uapi/linux/netfilter/nf_conntrack_common.h +++ b/include/uapi/linux/netfilter/nf_conntrack_common.h @@ -106,7 +106,7 @@ enum ip_conntrack_status { IPS_NAT_CLASH = IPS_UNTRACKED, #endif - /* Conntrack got a helper explicitly attached via CT target. */ + /* Conntrack got a helper explicitly attached (ruleset, ctnetlink). */ IPS_HELPER_BIT = 13, IPS_HELPER = (1 << IPS_HELPER_BIT), |