summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2020-02-24 10:09:43 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2020-02-24 10:09:43 +1100
commitb23b59c9ffc9400a5b83f3391094dede844e20cf (patch)
treee50737441e36bcd655b829374720a6361ee7cc86 /net/ipv6
parent79db35386269bb295c1ebe986f7b76cb6310e16e (diff)
parentdda520c4d4623701dd70cf7b40d29a4eed232d0f (diff)
downloadlinux-next-b23b59c9ffc9400a5b83f3391094dede844e20cf.tar.gz
Merge remote-tracking branch 'ipsec-next/master'
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/esp6.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index a3b403ba8f8f..11143d039f16 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -207,22 +207,6 @@ static void esp_output_done_esn(struct crypto_async_request *base, int err)
esp_output_done(base, err);
}
-static void esp_output_fill_trailer(u8 *tail, int tfclen, int plen, __u8 proto)
-{
- /* Fill padding... */
- if (tfclen) {
- memset(tail, 0, tfclen);
- tail += tfclen;
- }
- do {
- int i;
- for (i = 0; i < plen - 2; i++)
- tail[i] = i + 1;
- } while (0);
- tail[plen - 2] = plen - 2;
- tail[plen - 1] = proto;
-}
-
int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *esp)
{
u8 *tail;