diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-22 21:07:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-22 21:07:39 -0500 |
commit | e1ad2ab2cf0cabcd81861e2c61870fc27bb27ded (patch) | |
tree | 052495802067a0b1aa2513af867c57bb954c6fe3 | |
parent | 1744a8fe09e5db7315a57da52fa7c1afa779cfa0 (diff) |
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 2328532f0076..b965ad795b60 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -843,7 +843,8 @@ __be16 xfrm_flowi_dport(const struct flowi *fl) | |||
843 | return port; | 843 | return port; |
844 | } | 844 | } |
845 | 845 | ||
846 | extern int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl, | 846 | extern int xfrm_selector_match(struct xfrm_selector *sel, |
847 | const struct flowi *fl, | ||
847 | unsigned short family); | 848 | unsigned short family); |
848 | 849 | ||
849 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 850 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index ccd47cf1765c..71e6dc25bc5c 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, | |||
58 | int dir); | 58 | int dir); |
59 | 59 | ||
60 | static inline int | 60 | static inline int |
61 | __xfrm4_selector_match(struct xfrm_selector *sel, struct flowi *fl) | 61 | __xfrm4_selector_match(struct xfrm_selector *sel, const struct flowi *fl) |
62 | { | 62 | { |
63 | return addr_match(&fl->fl4_dst, &sel->daddr, sel->prefixlen_d) && | 63 | return addr_match(&fl->fl4_dst, &sel->daddr, sel->prefixlen_d) && |
64 | addr_match(&fl->fl4_src, &sel->saddr, sel->prefixlen_s) && | 64 | addr_match(&fl->fl4_src, &sel->saddr, sel->prefixlen_s) && |
@@ -69,7 +69,7 @@ __xfrm4_selector_match(struct xfrm_selector *sel, struct flowi *fl) | |||
69 | } | 69 | } |
70 | 70 | ||
71 | static inline int | 71 | static inline int |
72 | __xfrm6_selector_match(struct xfrm_selector *sel, struct flowi *fl) | 72 | __xfrm6_selector_match(struct xfrm_selector *sel, const struct flowi *fl) |
73 | { | 73 | { |
74 | return addr_match(&fl->fl6_dst, &sel->daddr, sel->prefixlen_d) && | 74 | return addr_match(&fl->fl6_dst, &sel->daddr, sel->prefixlen_d) && |
75 | addr_match(&fl->fl6_src, &sel->saddr, sel->prefixlen_s) && | 75 | addr_match(&fl->fl6_src, &sel->saddr, sel->prefixlen_s) && |
@@ -79,8 +79,8 @@ __xfrm6_selector_match(struct xfrm_selector *sel, struct flowi *fl) | |||
79 | (fl->oif == sel->ifindex || !sel->ifindex); | 79 | (fl->oif == sel->ifindex || !sel->ifindex); |
80 | } | 80 | } |
81 | 81 | ||
82 | int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl, | 82 | int xfrm_selector_match(struct xfrm_selector *sel, const struct flowi *fl, |
83 | unsigned short family) | 83 | unsigned short family) |
84 | { | 84 | { |
85 | switch (family) { | 85 | switch (family) { |
86 | case AF_INET: | 86 | case AF_INET: |