diff options
| author | Florian Westphal <fw@strlen.de> | 2020-05-04 10:06:08 +0200 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2020-05-06 09:40:08 +0200 |
| commit | f3075f48ddb2c4d076aeda36fa0939163e4b2816 (patch) | |
| tree | 10f29b0f502ff31b6831254819ddc3e25f49a3bb /net/ipv6/xfrm6_state.c | |
| parent | ede64dd2bfe2710549f1922a214959d966baaac3 (diff) | |
| download | linux-stable-f3075f48ddb2c4d076aeda36fa0939163e4b2816.tar.gz linux-stable-f3075f48ddb2c4d076aeda36fa0939163e4b2816.tar.bz2 linux-stable-f3075f48ddb2c4d076aeda36fa0939163e4b2816.zip | |
xfrm: remove extract_output indirection from xfrm_state_afinfo
Move this to xfrm_output.c. This avoids the state->extract_output
indirection.
This patch also removes the duplicated __xfrm6_extract_header helper
added in an earlier patch, we can now use the one from xfrm_inout.h .
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv6/xfrm6_state.c')
| -rw-r--r-- | net/ipv6/xfrm6_state.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c index 8fbf5a68ee6e..15247f2f78e1 100644 --- a/net/ipv6/xfrm6_state.c +++ b/net/ipv6/xfrm6_state.c @@ -19,7 +19,6 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = { .proto = IPPROTO_IPV6, .output = xfrm6_output, .output_finish = xfrm6_output_finish, - .extract_output = xfrm6_extract_output, .transport_finish = xfrm6_transport_finish, .local_error = xfrm6_local_error, }; |