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

xfrm: Mark flowi arg to xfrm_selector_match() const. 



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

include/net/xfrm.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -843,7 +843,8 @@ __be16 xfrm_flowi_dport(const struct flowi *fl) 
	return port;

	return port;

}

}





extern int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl,

extern int xfrm_selector_match(struct xfrm_selector *sel,

			       const struct flowi *fl,

			       unsigned short family);

			       unsigned short family);





#ifdef CONFIG_SECURITY_NETWORK_XFRM

#ifdef CONFIG_SECURITY_NETWORK_XFRM

net/xfrm/xfrm_policy.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol, 
						int dir);

						int dir);





static inline int

static inline int

__xfrm4_selector_match(struct xfrm_selector *sel, struct flowi *fl)

__xfrm4_selector_match(struct xfrm_selector *sel, const struct flowi *fl)

{

{

	return  addr_match(&fl->fl4_dst, &sel->daddr, sel->prefixlen_d) &&

	return  addr_match(&fl->fl4_dst, &sel->daddr, sel->prefixlen_d) &&

		addr_match(&fl->fl4_src, &sel->saddr, sel->prefixlen_s) &&

		addr_match(&fl->fl4_src, &sel->saddr, sel->prefixlen_s) &&
@@ -69,7 +69,7 @@ __xfrm4_selector_match(struct xfrm_selector *sel, struct flowi *fl) 
}

}





static inline int

static inline int

__xfrm6_selector_match(struct xfrm_selector *sel, struct flowi *fl)

__xfrm6_selector_match(struct xfrm_selector *sel, const struct flowi *fl)

{

{

	return  addr_match(&fl->fl6_dst, &sel->daddr, sel->prefixlen_d) &&

	return  addr_match(&fl->fl6_dst, &sel->daddr, sel->prefixlen_d) &&

		addr_match(&fl->fl6_src, &sel->saddr, sel->prefixlen_s) &&

		addr_match(&fl->fl6_src, &sel->saddr, sel->prefixlen_s) &&
@@ -79,7 +79,7 @@ __xfrm6_selector_match(struct xfrm_selector *sel, struct flowi *fl) 
		(fl->oif == sel->ifindex || !sel->ifindex);

		(fl->oif == sel->ifindex || !sel->ifindex);

}

}





int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl,

int xfrm_selector_match(struct xfrm_selector *sel, const struct flowi *fl,

			unsigned short family)

			unsigned short family)

{

{

	switch (family) {

	switch (family) {