Commit b01a277a authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Steffen Klassert
Browse files

xfrm: free not used XFRM_ESP_NO_TRAILER flag 



After removal of Innova IPsec support from mlx5 driver, the last user
of this XFRM_ESP_NO_TRAILER was gone too. This means that we can safely
remove it as no other hardware is capable (or need) to remove ESP trailer.

Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 949dfdcf

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ struct xfrm_offload { 
#define	CRYPTO_FALLBACK		8

#define	XFRM_GSO_SEGMENT	16

#define	XFRM_GRO		32

#define	XFRM_ESP_NO_TRAILER	64

/* 64 is free */

#define	XFRM_DEV_RESUME		128

#define	XFRM_XMIT		256

net/ipv4/esp4.c

+0 −6
Original line number Diff line number Diff line
@@ -705,7 +705,6 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
static inline int esp_remove_trailer(struct sk_buff *skb)

{

	struct xfrm_state *x = xfrm_input_state(skb);

	struct xfrm_offload *xo = xfrm_offload(skb);

	struct crypto_aead *aead = x->data;

	int alen, hlen, elen;

	int padlen, trimlen;
@@ -717,11 +716,6 @@ static inline int esp_remove_trailer(struct sk_buff *skb) 
	hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);

	elen = skb->len - hlen;



	if (xo && (xo->flags & XFRM_ESP_NO_TRAILER)) {

		ret = xo->proto;

		goto out;

	}



	if (skb_copy_bits(skb, skb->len - alen - 2, nexthdr, 2))

		BUG();

net/ipv6/esp6.c

+0 −6
Original line number Diff line number Diff line
@@ -741,7 +741,6 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) 
static inline int esp_remove_trailer(struct sk_buff *skb)

{

	struct xfrm_state *x = xfrm_input_state(skb);

	struct xfrm_offload *xo = xfrm_offload(skb);

	struct crypto_aead *aead = x->data;

	int alen, hlen, elen;

	int padlen, trimlen;
@@ -753,11 +752,6 @@ static inline int esp_remove_trailer(struct sk_buff *skb) 
	hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);

	elen = skb->len - hlen;



	if (xo && (xo->flags & XFRM_ESP_NO_TRAILER)) {

		ret = xo->proto;

		goto out;

	}



	ret = skb_copy_bits(skb, skb->len - alen - 2, nexthdr, 2);

	BUG_ON(ret);