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

Commit 19bd6244 authored by David S. Miller's avatar David S. Miller
Browse files

xfrm: Const'ify tmpl and address arguments to ->init_temprop() 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 214e005b

include/net/xfrm.h

+4 −2
Original line number Diff line number Diff line
@@ -302,8 +302,10 @@ struct xfrm_state_afinfo { 
	int			(*init_flags)(struct xfrm_state *x);

	void			(*init_tempsel)(struct xfrm_selector *sel,

						const struct flowi *fl);

	void			(*init_temprop)(struct xfrm_state *x, struct xfrm_tmpl *tmpl,

						xfrm_address_t *daddr, xfrm_address_t *saddr);

	void			(*init_temprop)(struct xfrm_state *x,

						const struct xfrm_tmpl *tmpl,

						const xfrm_address_t *daddr,

						const xfrm_address_t *saddr);

	int			(*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);

	int			(*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);

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

net/ipv4/xfrm4_state.c

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ __xfrm4_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl) 
}



static void

xfrm4_init_temprop(struct xfrm_state *x, struct xfrm_tmpl *tmpl,

		   xfrm_address_t *daddr, xfrm_address_t *saddr)

xfrm4_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl,

		   const xfrm_address_t *daddr, const xfrm_address_t *saddr)

{

	x->id = tmpl->id;

	if (x->id.daddr.a4 == 0)

net/ipv6/xfrm6_state.c

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ __xfrm6_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl) 
}



static void

xfrm6_init_temprop(struct xfrm_state *x, struct xfrm_tmpl *tmpl,

		   xfrm_address_t *daddr, xfrm_address_t *saddr)

xfrm6_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl,

		   const xfrm_address_t *daddr, const xfrm_address_t *saddr)

{

	x->id = tmpl->id;

	if (ipv6_addr_any((struct in6_addr*)&x->id.daddr))