diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-23 03:24:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-23 03:24:19 +0100 |
| commit | b520e9f616f4f29c8d2557ba704b74ce6d79ff07 (patch) | |
| tree | 6d423a4be60b1c1a54cc5546843336b9f1c858c7 | |
| parent | xfrm: Mark flowi arg to xfrm_init_tempstate() const. (diff) | |
| download | linux-b520e9f616f4f29c8d2557ba704b74ce6d79ff07.tar.xz linux-b520e9f616f4f29c8d2557ba704b74ce6d79ff07.zip | |
xfrm: Mark flowi arg to xfrm_state_find() const.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/xfrm.h | 6 | ||||
| -rw-r--r-- | net/xfrm/xfrm_state.c | 2 |
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, int (*func)(struct xfrm_state *, int, void*), void *); extern void xfrm_state_walk_done(struct xfrm_state_walk *walk); extern struct xfrm_state *xfrm_state_alloc(struct net *net); -extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, - struct flowi *fl, struct xfrm_tmpl *tmpl, +extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, + xfrm_address_t *saddr, + const struct flowi *fl, + struct xfrm_tmpl *tmpl, struct xfrm_policy *pol, int *err, unsigned short family); extern 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, struct xfrm_state * xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, - struct flowi *fl, struct xfrm_tmpl *tmpl, + const struct flowi *fl, struct xfrm_tmpl *tmpl, struct xfrm_policy *pol, int *err, unsigned short family) { |