Commit eb878e84 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

[IPSEC]: output mode to take an xfrm state as input param 



Expose IPSEC modes output path to take an xfrm state as input param.
This makes it consistent with the input mode processing (which already
takes the xfrm state as a param).

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fda9ef5d

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ extern void xfrm_put_type(struct xfrm_type *type); 


struct xfrm_mode {

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

	int (*output)(struct sk_buff *skb);

	int (*output)(struct xfrm_state *x,struct sk_buff *skb);



	struct module *owner;

	unsigned int encap;

net/ipv4/xfrm4_mode_transport.c

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,8 @@ 
 * On exit, skb->h will be set to the start of the payload to be processed

 * by x->type->output and skb->nh will be set to the top IP header.

 */

static int xfrm4_transport_output(struct sk_buff *skb)

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

{

	struct xfrm_state *x;

	struct iphdr *iph;

	int ihl;
@@ -33,7 +32,6 @@ static int xfrm4_transport_output(struct sk_buff *skb) 
	ihl = iph->ihl * 4;

	skb->h.raw += ihl;



	x = skb->dst->xfrm;

	skb->nh.raw = memmove(skb_push(skb, x->props.header_len), iph, ihl);

	return 0;

}

net/ipv4/xfrm4_mode_tunnel.c

+1 −2
Original line number Diff line number Diff line
@@ -33,10 +33,9 @@ static inline void ipip_ecn_decapsulate(struct sk_buff *skb) 
 * On exit, skb->h will be set to the start of the payload to be processed

 * by x->type->output and skb->nh will be set to the top IP header.

 */

static int xfrm4_tunnel_output(struct sk_buff *skb)

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

{

	struct dst_entry *dst = skb->dst;

	struct xfrm_state *x = dst->xfrm;

	struct iphdr *iph, *top_iph;

	int flags;

net/ipv4/xfrm4_output.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static int xfrm4_output_one(struct sk_buff *skb) 
		if (err)

			goto error;



		err = x->mode->output(skb);

		err = x->mode->output(x, skb);

		if (err)

			goto error;

net/ipv6/xfrm6_mode_ro.c

+1 −2
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ 
 * its absence, that of the top IP header.  The value of skb->data will always

 * point to the top IP header.

 */

static int xfrm6_ro_output(struct sk_buff *skb)

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

{

	struct xfrm_state *x = skb->dst->xfrm;

	struct ipv6hdr *iph;

	u8 *prevhdr;

	int hdr_len;