Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e695633e authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC]: Kill unused decap state argument 



This patch removes the decap_state argument from the xfrm input hook.
Previously this function allowed the input hook to share state with
the post_input hook.  The latter has since been removed.

The only purpose for it now is to check the encap type.  However, it
is easier and better to move the encap type check to the generic
xfrm_rcv function.  This allows us to get rid of the decap state
argument altogether.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15901dc9

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ struct xfrm_type 


	int			(*init_state)(struct xfrm_state *x);

	void			(*destructor)(struct xfrm_state *);

	int			(*input)(struct xfrm_state *, struct xfrm_decap_state *, struct sk_buff *skb);

	int			(*input)(struct xfrm_state *, struct sk_buff *skb);

	int			(*output)(struct xfrm_state *, struct sk_buff *pskb);

	/* Estimate maximal size of result of transformation of a dgram */

	u32			(*get_max_size)(struct xfrm_state *, int size);

net/ipv4/ah4.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ error: 
	return err;

}



static int ah_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb)

static int ah_input(struct xfrm_state *x, struct sk_buff *skb)

{

	int ah_hlen;

	struct iphdr *iph;

net/ipv4/esp4.c

+1 −4
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ error: 
 * expensive, so we only support truncated data, which is the recommended

 * and common case.

 */

static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb)

static int esp_input(struct xfrm_state *x, struct sk_buff *skb)

{

	struct iphdr *iph;

	struct ip_esp_hdr *esph;
@@ -208,9 +208,6 @@ static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struc 
		struct xfrm_encap_tmpl *encap = x->encap;

		struct udphdr *uh;



		if (encap->encap_type != decap->decap_type)

			goto out;



		uh = (struct udphdr *)(iph + 1);

		encap_len = (void*)esph - (void*)uh;

net/ipv4/ipcomp.c

+1 −2
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ out: 
	return err;

}



static int ipcomp_input(struct xfrm_state *x,

                        struct xfrm_decap_state *decap, struct sk_buff *skb)

static int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb)

{

	u8 nexthdr;

	int err = 0;

net/ipv4/xfrm4_input.c

+4 −1
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type) 
		if (unlikely(x->km.state != XFRM_STATE_VALID))

			goto drop_unlock;



		if (x->encap->encap_type != encap_type)

			goto drop_unlock;



		if (x->props.replay_window && xfrm_replay_check(x, seq))

			goto drop_unlock;
@@ -97,7 +100,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type) 
			goto drop_unlock;



		xfrm_vec[xfrm_nr].decap.decap_type = encap_type;

		if (x->type->input(x, &(xfrm_vec[xfrm_nr].decap), skb))

		if (x->type->input(x, skb))

			goto drop_unlock;



		/* only the first xfrm gets the encap type */