diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-22 21:35:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-22 21:35:39 -0500 |
commit | a6c2e611152fcdc67047aaa56b75b9cfc592ce71 (patch) | |
tree | 5cda9c2a9698fd03385cd0853b15d2d53f18d150 /net/xfrm/xfrm_policy.c | |
parent | 73ff93cd0249e822c4fee367e1fd4ad4a45a5515 (diff) |
xfrm: Mark flowi arg to xfrm_tmpl_resolve{,_one}() const.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 84e4f7472bac..3d4545683268 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -1157,9 +1157,8 @@ xfrm_get_saddr(struct net *net, xfrm_address_t *local, xfrm_address_t *remote, | |||
1157 | /* Resolve list of templates for the flow, given policy. */ | 1157 | /* Resolve list of templates for the flow, given policy. */ |
1158 | 1158 | ||
1159 | static int | 1159 | static int |
1160 | xfrm_tmpl_resolve_one(struct xfrm_policy *policy, struct flowi *fl, | 1160 | xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl, |
1161 | struct xfrm_state **xfrm, | 1161 | struct xfrm_state **xfrm, unsigned short family) |
1162 | unsigned short family) | ||
1163 | { | 1162 | { |
1164 | struct net *net = xp_net(policy); | 1163 | struct net *net = xp_net(policy); |
1165 | int nx; | 1164 | int nx; |
@@ -1214,9 +1213,8 @@ fail: | |||
1214 | } | 1213 | } |
1215 | 1214 | ||
1216 | static int | 1215 | static int |
1217 | xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, struct flowi *fl, | 1216 | xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, const struct flowi *fl, |
1218 | struct xfrm_state **xfrm, | 1217 | struct xfrm_state **xfrm, unsigned short family) |
1219 | unsigned short family) | ||
1220 | { | 1218 | { |
1221 | struct xfrm_state *tp[XFRM_MAX_DEPTH]; | 1219 | struct xfrm_state *tp[XFRM_MAX_DEPTH]; |
1222 | struct xfrm_state **tpp = (npols > 1) ? tp : xfrm; | 1220 | struct xfrm_state **tpp = (npols > 1) ? tp : xfrm; |