diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-08 20:07:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-08 20:07:58 -0700 |
| commit | 2650be2c2d594c4697ff0fdf300cd5274114de0e (patch) | |
| tree | 357304d8286f5f1b09cb3fe7bd1534c0d9109714 /include | |
| parent | 843d926b003ea692468c8cc5bea1f9f58dfa8c75 (diff) | |
| parent | 0c92411bb81de9bc516d6924f50289d8d5f880e5 (diff) | |
| download | cachepc-linux-2650be2c2d594c4697ff0fdf300cd5274114de0e.tar.gz cachepc-linux-2650be2c2d594c4697ff0fdf300cd5274114de0e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
===================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Allow conntrack entries with l3num == NFPROTO_IPV4 or == NFPROTO_IPV6
only via ctnetlink, from Will McVicker.
2) Batch notifications to userspace to improve netlink socket receive
utilization.
3) Restore mark based dump filtering via ctnetlink, from Martin Willi.
4) nf_conncount_init() fails with -EPROTO with CONFIG_IPV6, from
Eelco Chaudron.
5) Containers fail to match on meta skuid and skgid, use socket user_ns
to retrieve meta skuid and skgid.
===================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netns/nftables.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netns/nftables.h b/include/net/netns/nftables.h index a1a8d45adb42..6c0806bd8d1e 100644 --- a/include/net/netns/nftables.h +++ b/include/net/netns/nftables.h @@ -8,6 +8,7 @@ struct netns_nftables { struct list_head tables; struct list_head commit_list; struct list_head module_list; + struct list_head notify_list; struct mutex commit_mutex; unsigned int base_seq; u8 gencursor; |