diff options
| author | David S. Miller <davem@davemloft.net> | 2022-03-19 15:49:08 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-19 15:49:08 +0100 |
| commit | 62f65554f5cffb17234e2b267d6376efc561d1c0 (patch) | |
| tree | 059c5b7c8389ee1251c95054ac85e074e352ad8b /include/net/netns | |
| parent | ptp: ocp: use snprintf() in ptp_ocp_verify() (diff) | |
| parent | xfrm: rework default policy structure (diff) | |
| download | linux-62f65554f5cffb17234e2b267d6376efc561d1c0.tar.xz linux-62f65554f5cffb17234e2b267d6376efc561d1c0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/
ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2022-03-19
1) Delete duplicated functions that calls same xfrm_api_check.
From Leon Romanovsky.
2) Align userland API of the default policy structure to the
internal structures. From Nicolas Dichtel.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netns')
| -rw-r--r-- | include/net/netns/xfrm.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h index 947733a639a6..bd7c3be4af5d 100644 --- a/include/net/netns/xfrm.h +++ b/include/net/netns/xfrm.h @@ -66,11 +66,7 @@ struct netns_xfrm { int sysctl_larval_drop; u32 sysctl_acq_expires; - u8 policy_default; -#define XFRM_POL_DEFAULT_IN 1 -#define XFRM_POL_DEFAULT_OUT 2 -#define XFRM_POL_DEFAULT_FWD 4 -#define XFRM_POL_DEFAULT_MASK 7 + u8 policy_default[XFRM_POLICY_MAX]; #ifdef CONFIG_SYSCTL struct ctl_table_header *sysctl_hdr; |