summaryrefslogtreecommitdiff
path: root/net/ipv4/xfrm4_state.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2020-05-04 10:06:09 +0200
committerSteffen Klassert <steffen.klassert@secunet.com>2020-05-06 09:40:08 +0200
commit2ab6096db2f16b3a6adbad252f1be171e649028d (patch)
treef4a096067056306539416fec2f73f0ad27fe03be /net/ipv4/xfrm4_state.c
parentf3075f48ddb2c4d076aeda36fa0939163e4b2816 (diff)
downloadlwn-2ab6096db2f16b3a6adbad252f1be171e649028d.tar.gz
lwn-2ab6096db2f16b3a6adbad252f1be171e649028d.zip
xfrm: remove output_finish indirection from xfrm_state_afinfo
There are only two implementaions, one for ipv4 and one for ipv6. Both are almost identical, they clear skb->cb[], set the TRANSFORMED flag in IP(6)CB and then call the common xfrm_output() function. By placing the IPCB handling into the common function, we avoid the need for the output_finish indirection as the output functions can simply use xfrm_output(). Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv4/xfrm4_state.c')
-rw-r--r--net/ipv4/xfrm4_state.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index b23a1711297b..87d4db591488 100644
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -14,7 +14,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = {
.family = AF_INET,
.proto = IPPROTO_IPIP,
.output = xfrm4_output,
- .output_finish = xfrm4_output_finish,
.transport_finish = xfrm4_transport_finish,
.local_error = xfrm4_local_error,
};