xfrm: Mark flowi arg to xfrm_tmpl_resolve{,_one}() const. (a6c2e611) · Commits · 戴 / test

net/xfrm/xfrm_policy.c

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1157,9 +1157,8 @@ xfrm_get_saddr(struct net net, xfrm_address_t local, xfrm_address_t *remote,
	/* Resolve list of templates for the flow, given policy. */		/* Resolve list of templates for the flow, given policy. */

	static int		static int
	xfrm_tmpl_resolve_one(struct xfrm_policy policy, struct flowi fl,		xfrm_tmpl_resolve_one(struct xfrm_policy policy, const struct flowi fl,
	struct xfrm_state **xfrm,		struct xfrm_state **xfrm, unsigned short family)
	unsigned short family)
	{		{
	struct net *net = xp_net(policy);		struct net *net = xp_net(policy);
	int nx;		int nx;
	@@ -1214,9 +1213,8 @@ fail:
	}		}

	static int		static int
	xfrm_tmpl_resolve(struct xfrm_policy *pols, int npols, struct flowi fl,		xfrm_tmpl_resolve(struct xfrm_policy *pols, int npols, const struct flowi fl,
	struct xfrm_state **xfrm,		struct xfrm_state **xfrm, unsigned short family)
	unsigned short family)
	{		{
	struct xfrm_state *tp[XFRM_MAX_DEPTH];		struct xfrm_state *tp[XFRM_MAX_DEPTH];
	struct xfrm_state **tpp = (npols > 1) ? tp : xfrm;		struct xfrm_state **tpp = (npols > 1) ? tp : xfrm;