diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-08-06 11:51:42 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-08-06 11:53:47 -0700 |
| commit | 1962afd211597001c0582414a9dee66908a8ad8a (patch) | |
| tree | f5fcbeb33de33b8e23349682faae005f00e3d4a5 /include/linux/netfilter | |
| parent | ca10634ebcca850dec2f1507ad5bfe70b82a9c00 (diff) | |
| parent | 315f4bd234b3b8a3ed3a71fd4c53b110cf373720 (diff) | |
| download | linux-1962afd211597001c0582414a9dee66908a8ad8a.tar.gz linux-1962afd211597001c0582414a9dee66908a8ad8a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.2-rc7).
No conflicts, or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/netfilter')
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h index b98331572ad2..c46864cc6623 100644 --- a/include/linux/netfilter/ipset/ip_set.h +++ b/include/linux/netfilter/ipset/ip_set.h @@ -244,8 +244,8 @@ extern void ip_set_type_unregister(struct ip_set_type *set_type); /* A generic IP set */ struct ip_set { - /* For call_cru in destroy */ - struct rcu_head rcu; + /* for set destruction */ + struct rcu_work rwork; /* The name of the set */ char name[IPSET_MAXNAMELEN]; /* Lock protecting the set data */ @@ -273,7 +273,7 @@ struct ip_set { /* Number of elements (vs timeout) */ u32 elements; /* Size of the dynamic extensions (vs timeout) */ - size_t ext_size; + atomic64_t ext_size; /* Element data size */ size_t dsize; /* Offsets to extensions in elements */ |