diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2020-10-12 15:00:36 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2020-10-12 15:00:36 -0700 |
| commit | a308283fdbf712b30061d2b4567530eb9e8dc1b4 (patch) | |
| tree | 87b1477a7d57f6b0c3f189ecfb1e0923b4c1f413 /include/uapi/linux | |
| parent | Merge branch 'bnxt_en-Updates-for-net-next' (diff) | |
| parent | netfilter: flowtable: reduce calls to pskb_may_pull() (diff) | |
| download | linux-a308283fdbf712b30061d2b4567530eb9e8dc1b4.tar.gz linux-a308283fdbf712b30061d2b4567530eb9e8dc1b4.tar.bz2 linux-a308283fdbf712b30061d2b4567530eb9e8dc1b4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
The following patchset contains Netfilter/IPVS updates for net-next:
1) Inspect the reply packets coming from DR/TUN and refresh connection
state and timeout, from longguang yue and Julian Anastasov.
2) Series to add support for the inet ingress chain type in nf_tables.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/netfilter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h index ca9e63d6e0e4..6a6179af0d7c 100644 --- a/include/uapi/linux/netfilter.h +++ b/include/uapi/linux/netfilter.h @@ -45,6 +45,7 @@ enum nf_inet_hooks { NF_INET_FORWARD, NF_INET_LOCAL_OUT, NF_INET_POST_ROUTING, + NF_INET_INGRESS, NF_INET_NUMHOOKS }; |