diff options
| author | David S. Miller <davem@davemloft.net> | 2022-04-25 10:45:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-25 10:45:04 +0100 |
| commit | 5220a5251130c251877df4ac6ec7d473668b98a7 (patch) | |
| tree | df2092f6afb7e803da76b5f2420949e0a4941165 /net/ipv4 | |
| parent | 165e3e17fe8fe6a8aab319bc6e631a2e23b9a857 (diff) | |
| parent | 8ddffdb9442a9d60b4a6e679ac48d7d21403a674 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Fix incorrect printing of memory size of IPVS connection hash table,
from Pengcheng Yang.
2) Fix spurious EEXIST errors in nft_set_rbtree.
3) Remove leftover empty flowtable file, from Rongguang Wei.
4) Fix ip6_route_me_harder() with vrf driver, from Martin Willi.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/nf_flow_table_ipv4.c | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/nf_flow_table_ipv4.c b/net/ipv4/netfilter/nf_flow_table_ipv4.c deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/net/ipv4/netfilter/nf_flow_table_ipv4.c +++ /dev/null |