OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next
authorJakub Kicinski <kuba@kernel.org>
Tue, 15 Mar 2022 18:52:25 +0000 (11:52 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 15 Mar 2022 18:52:25 +0000 (11:52 -0700)
commitabe2fec8ee66017aa32abc47c52266da6fbe1d9a
tree37b8877600644e4f556c316150ea26bf0f089535
parent72f56fdb97b26bc9a1ce297a636b91c19593eb19
parent334ff12284fc56bdc5af6d310c6381d96906f5a0
Merge git://git./linux/kernel/git/netfilter/nf-next

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

1) Revert CHECKSUM_UNNECESSARY for UDP packet from conntrack.

2) Reject unsupported families when creating tables, from Phil Sutter.

3) GRE support for the flowtable, from Toshiaki Makita.

4) Add GRE offload support for act_ct, also from Toshiaki.

5) Update mlx5 driver to support for GRE flowtable offload,
   from Toshiaki Makita.

6) Oneliner to clean up incorrect indentation in nf_conntrack_bridge,
   from Jiapeng Chong.

* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next:
  netfilter: bridge: clean up some inconsistent indenting
  net/mlx5: Support GRE conntrack offload
  act_ct: Support GRE offload
  netfilter: flowtable: Support GRE
  netfilter: nf_tables: Reject tables of unsupported family
  Revert "netfilter: conntrack: mark UDP zero checksum as CHECKSUM_UNNECESSARY"
====================

Link: https://lore.kernel.org/r/20220315091513.66544-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
net/bridge/netfilter/nf_conntrack_bridge.c
net/netfilter/nf_flow_table_ip.c
net/netfilter/nf_flow_table_offload.c
net/netfilter/nf_tables_api.c
net/sched/act_ct.c