aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-22 21:24:19 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-22 21:24:19 -0500
commitb520e9f616f4f29c8d2557ba704b74ce6d79ff07 (patch)
tree6d423a4be60b1c1a54cc5546843336b9f1c858c7
parent1a898592b2bde7b109e121ccb7498d40396fb5c7 (diff)
xfrm: Mark flowi arg to xfrm_state_find() const.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/xfrm.h6
-rw-r--r--net/xfrm/xfrm_state.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index b965ad795b60..bb824a5d71bf 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1328,8 +1328,10 @@ extern int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,
1328 int (*func)(struct xfrm_state *, int, void*), void *); 1328 int (*func)(struct xfrm_state *, int, void*), void *);
1329extern void xfrm_state_walk_done(struct xfrm_state_walk *walk); 1329extern void xfrm_state_walk_done(struct xfrm_state_walk *walk);
1330extern struct xfrm_state *xfrm_state_alloc(struct net *net); 1330extern struct xfrm_state *xfrm_state_alloc(struct net *net);
1331extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, 1331extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr,
1332 struct flowi *fl, struct xfrm_tmpl *tmpl, 1332 xfrm_address_t *saddr,
1333 const struct flowi *fl,
1334 struct xfrm_tmpl *tmpl,
1333 struct xfrm_policy *pol, int *err, 1335 struct xfrm_policy *pol, int *err,
1334 unsigned short family); 1336 unsigned short family);
1335extern struct xfrm_state *xfrm_stateonly_find(struct net *net, u32 mark, 1337extern struct xfrm_state *xfrm_stateonly_find(struct net *net, u32 mark,
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 674f2780cedd..30a0f178819c 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -785,7 +785,7 @@ static void xfrm_state_look_at(struct xfrm_policy *pol, struct xfrm_state *x,
785 785
786struct xfrm_state * 786struct xfrm_state *
787xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, 787xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
788 struct flowi *fl, struct xfrm_tmpl *tmpl, 788 const struct flowi *fl, struct xfrm_tmpl *tmpl,
789 struct xfrm_policy *pol, int *err, 789 struct xfrm_policy *pol, int *err,
790 unsigned short family) 790 unsigned short family)
791{ 791{