diff options
-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, | |||
1328 | int (*func)(struct xfrm_state *, int, void*), void *); | 1328 | int (*func)(struct xfrm_state *, int, void*), void *); |
1329 | extern void xfrm_state_walk_done(struct xfrm_state_walk *walk); | 1329 | extern void xfrm_state_walk_done(struct xfrm_state_walk *walk); |
1330 | extern struct xfrm_state *xfrm_state_alloc(struct net *net); | 1330 | extern struct xfrm_state *xfrm_state_alloc(struct net *net); |
1331 | extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | 1331 | extern 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); |
1335 | extern struct xfrm_state *xfrm_stateonly_find(struct net *net, u32 mark, | 1337 | 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, | |||
785 | 785 | ||
786 | struct xfrm_state * | 786 | struct xfrm_state * |
787 | xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | 787 | xfrm_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 | { |