diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2024-10-25 09:08:22 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-10-25 09:08:22 +0200 |
| commit | 03fc07a24735e0be8646563913abf5f5cb71ad19 (patch) | |
| tree | 5fe666c4ed732b163324aa08e210a69b593e4e8c /include/net/netns | |
| parent | 81bc949f640f78b507c7523de7c750bcc87c1bb8 (diff) | |
| parent | d44cd8226449114780a8554fd253c7e3d171a0a6 (diff) | |
| download | linux-03fc07a24735e0be8646563913abf5f5cb71ad19.tar.gz linux-03fc07a24735e0be8646563913abf5f5cb71ad19.tar.bz2 linux-03fc07a24735e0be8646563913abf5f5cb71ad19.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts and no adjacent changes.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include/net/netns')
| -rw-r--r-- | include/net/netns/xfrm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h index d489d9250bff..ae60d6664095 100644 --- a/include/net/netns/xfrm.h +++ b/include/net/netns/xfrm.h @@ -51,7 +51,6 @@ struct netns_xfrm { struct hlist_head *policy_byidx; unsigned int policy_idx_hmask; unsigned int idx_generator; - struct hlist_head policy_inexact[XFRM_POLICY_MAX]; struct xfrm_policy_hash policy_bydst[XFRM_POLICY_MAX]; unsigned int policy_count[XFRM_POLICY_MAX * 2]; struct work_struct policy_hash_work; |