diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2013-01-31 05:40:38 -0500 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2013-02-01 04:13:43 -0500 |
| commit | 7e50f84c94b82c3b2d23ac8878012b3b60ea0e96 (patch) | |
| tree | 27bcbe4b323b19de578acd87361490a60e72a594 /include | |
| parent | cdfa1fe5c0d4f2815acfe8cd7730a0b3d8d0a3e9 (diff) | |
pf_key/xfrm_algo: prepare pf_key and xfrm_algo for new algorithms without pfkey support
Mark existing algorithms as pfkey supported and make pfkey only use algorithms
that have pfkey_supported set.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/xfrm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 421f764794d5..814a1baa175c 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
| @@ -1320,6 +1320,7 @@ struct xfrm_algo_desc { | |||
| 1320 | char *name; | 1320 | char *name; |
| 1321 | char *compat; | 1321 | char *compat; |
| 1322 | u8 available:1; | 1322 | u8 available:1; |
| 1323 | u8 pfkey_supported:1; | ||
| 1323 | union { | 1324 | union { |
| 1324 | struct xfrm_algo_aead_info aead; | 1325 | struct xfrm_algo_aead_info aead; |
| 1325 | struct xfrm_algo_auth_info auth; | 1326 | struct xfrm_algo_auth_info auth; |
| @@ -1561,8 +1562,8 @@ extern void xfrm_input_init(void); | |||
| 1561 | extern int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq); | 1562 | extern int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq); |
| 1562 | 1563 | ||
| 1563 | extern void xfrm_probe_algs(void); | 1564 | extern void xfrm_probe_algs(void); |
| 1564 | extern int xfrm_count_auth_supported(void); | 1565 | extern int xfrm_count_pfkey_auth_supported(void); |
| 1565 | extern int xfrm_count_enc_supported(void); | 1566 | extern int xfrm_count_pfkey_enc_supported(void); |
| 1566 | extern struct xfrm_algo_desc *xfrm_aalg_get_byidx(unsigned int idx); | 1567 | extern struct xfrm_algo_desc *xfrm_aalg_get_byidx(unsigned int idx); |
| 1567 | extern struct xfrm_algo_desc *xfrm_ealg_get_byidx(unsigned int idx); | 1568 | extern struct xfrm_algo_desc *xfrm_ealg_get_byidx(unsigned int idx); |
| 1568 | extern struct xfrm_algo_desc *xfrm_aalg_get_byid(int alg_id); | 1569 | extern struct xfrm_algo_desc *xfrm_aalg_get_byid(int alg_id); |
