diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-22 18:07:39 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-22 18:07:39 -0800 |
| commit | e1ad2ab2cf0cabcd81861e2c61870fc27bb27ded (patch) | |
| tree | 052495802067a0b1aa2513af867c57bb954c6fe3 | |
| parent | 1744a8fe09e5db7315a57da52fa7c1afa779cfa0 (diff) | |
| download | kernel_samsung_smdk4412-e1ad2ab2cf0cabcd81861e2c61870fc27bb27ded.zip kernel_samsung_smdk4412-e1ad2ab2cf0cabcd81861e2c61870fc27bb27ded.tar.gz kernel_samsung_smdk4412-e1ad2ab2cf0cabcd81861e2c61870fc27bb27ded.tar.bz2 | |
xfrm: Mark flowi arg to xfrm_selector_match() const.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/xfrm.h | 3 | ||||
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 2328532..b965ad7 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -843,7 +843,8 @@ __be16 xfrm_flowi_dport(const struct flowi *fl) 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); #ifdef CONFIG_SECURITY_NETWORK_XFRM diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index ccd47cf..71e6dc2 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -58,7 +58,7 @@ static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol, int dir); 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) && 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 -__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) && addr_match(&fl->fl6_src, &sel->saddr, sel->prefixlen_s) && @@ -79,8 +79,8 @@ __xfrm6_selector_match(struct xfrm_selector *sel, struct flowi *fl) (fl->oif == sel->ifindex || !sel->ifindex); } -int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl, - unsigned short family) +int xfrm_selector_match(struct xfrm_selector *sel, const struct flowi *fl, + unsigned short family) { switch (family) { case AF_INET: |