Commit dda520c4 authored by Raed Salem's avatar Raed Salem Committed by Steffen Klassert
Browse files

ESP: Export esp_output_fill_trailer function 



The esp fill trailer method is identical for both
IPv6 and IPv4.

Share the implementation for esp6 and esp to avoid
code duplication in addition it could be also used
at various drivers code.

Signed-off-by: default avatarRaed Salem <raeds@mellanox.com>
Reviewed-by: default avatarBoris Pismenny <borisp@mellanox.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent a4c278d1

include/net/esp.h

+16 −0
Original line number Diff line number Diff line
@@ -11,6 +11,22 @@ static inline struct ip_esp_hdr *ip_esp_hdr(const struct sk_buff *skb) 
	return (struct ip_esp_hdr *)skb_transport_header(skb);

}



static inline 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;

}



struct esp_info {

	struct	ip_esp_hdr *esph;

	__be64	seqno;

net/ipv4/esp4.c

+0 −16
Original line number Diff line number Diff line
@@ -341,22 +341,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;

}



static struct ip_esp_hdr *esp_output_udp_encap(struct sk_buff *skb,

					       int encap_type,

					       struct esp_info *esp,

net/ipv6/esp6.c

+0 −16
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE