Commit e1e10b44 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Steffen Klassert
Browse files

xfrm: pass extack down to xfrm_type ->init_state 



Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 48ff45da

include/net/xfrm.h

+2 −1
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ struct xfrm_type { 
#define XFRM_TYPE_LOCAL_COADDR	4

#define XFRM_TYPE_REMOTE_COADDR	8



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

	int			(*init_state)(struct xfrm_state *x,

					      struct netlink_ext_ack *extack);

	void			(*destructor)(struct xfrm_state *);

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

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

net/ipv4/ah4.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static int ah4_err(struct sk_buff *skb, u32 info) 
	return 0;

}



static int ah_init_state(struct xfrm_state *x)

static int ah_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)

{

	struct ah_data *ahp = NULL;

	struct xfrm_algo_desc *aalg_desc;

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ static int esp_init_authenc(struct xfrm_state *x) 
	return err;

}



static int esp_init_state(struct xfrm_state *x)

static int esp_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)

{

	struct crypto_aead *aead;

	u32 align;

net/ipv4/ipcomp.c

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ static int ipcomp_tunnel_attach(struct xfrm_state *x) 
	return err;

}



static int ipcomp4_init_state(struct xfrm_state *x)

static int ipcomp4_init_state(struct xfrm_state *x,

			      struct netlink_ext_ack *extack)

{

	int err = -EINVAL;

net/ipv4/xfrm4_tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static int ipip_xfrm_rcv(struct xfrm_state *x, struct sk_buff *skb) 
	return ip_hdr(skb)->protocol;

}



static int ipip_init_state(struct xfrm_state *x)

static int ipip_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)

{

	if (x->props.mode != XFRM_MODE_TUNNEL)

		return -EINVAL;