Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
authorJakub Kicinski <kuba@kernel.org>
Wed, 14 Dec 2022 03:32:52 +0000 (19:32 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 14 Dec 2022 03:32:53 +0000 (19:32 -0800)
commit7ae9888d6e1ce4062d27367a28e46a26270a3e52
treee8ffc57b854565497542ebce8932c815d866465c
parent2d4ee16d969c97996e80e4c9cb6de0acaff22c9f
parentf9645abe4255bd79e4c63799634c996dd53db321
Merge git://git./linux/kernel/git/netfilter/nf

Pablo Neira Ayuso says:

====================
Netfilter/IPVS fixes for net

1) Fix NAT IPv6 flowtable hardware offload, from Qingfang DENG.

2) Add a safety check to IPVS socket option interface report a
   warning if unsupported command is seen, this. From Li Qiong.

3) Document SCTP conntrack timeouts, from Sriram Yagnaraman.

* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: conntrack: document sctp timeouts
  ipvs: add a 'default' case in do_ip_vs_set_ctl()
  netfilter: flowtable: really fix NAT IPv6 offload
====================

Link: https://lore.kernel.org/r/20221213140923.154594-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/netfilter/ipvs/ip_vs_ctl.c