diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-09-07 16:31:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-07 16:31:30 +0200 |
| commit | b8f6a0eeb9b99f5f0df7ee34d775b9a3a63b53a3 (patch) | |
| tree | 9297682da73b9ab2b90848e253ecd9c0e9963d24 /net/netfilter/nf_conntrack_labels.c | |
| parent | Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (diff) | |
| parent | netfilter: nf_tables: fix possible null-pointer dereference in object update (diff) | |
| download | linux-dev-b8f6a0eeb9b99f5f0df7ee34d775b9a3a63b53a3.tar.xz linux-dev-b8f6a0eeb9b99f5f0df7ee34d775b9a3a63b53a3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains Netfilter updates for net-next:
1) Add nft_reg_store64() and nft_reg_load64() helpers, from Ander Juaristi.
2) Time matching support, also from Ander Juaristi.
3) VLAN support for nfnetlink_log, from Michael Braun.
4) Support for set element deletions from the packet path, also from Ander.
5) Remove __read_mostly from conntrack spinlock, from Li RongQing.
6) Support for updating stateful objects, this also includes the initial
client for this infrastructure: the quota extension. A follow up fix
for the control plane also comes in this batch. Patches from
Fernando Fernandez Mancera.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_labels.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_labels.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_labels.c b/net/netfilter/nf_conntrack_labels.c index d1c6b2a2e7bd..522792556632 100644 --- a/net/netfilter/nf_conntrack_labels.c +++ b/net/netfilter/nf_conntrack_labels.c @@ -11,7 +11,7 @@ #include <net/netfilter/nf_conntrack_ecache.h> #include <net/netfilter/nf_conntrack_labels.h> -static __read_mostly DEFINE_SPINLOCK(nf_connlabels_lock); +static DEFINE_SPINLOCK(nf_connlabels_lock); static int replace_u32(u32 *address, u32 mask, u32 new) { |