diff options
Diffstat (limited to 'net/xfrm/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 78f66fa92449..b2cd806c0be3 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -990,11 +990,13 @@ void xfrm_state_insert(struct xfrm_state *x) | |||
990 | EXPORT_SYMBOL(xfrm_state_insert); | 990 | EXPORT_SYMBOL(xfrm_state_insert); |
991 | 991 | ||
992 | /* xfrm_state_lock is held */ | 992 | /* xfrm_state_lock is held */ |
993 | static struct xfrm_state *__find_acq_core(struct net *net, struct xfrm_mark *m, | 993 | static struct xfrm_state *__find_acq_core(struct net *net, |
994 | const struct xfrm_mark *m, | ||
994 | unsigned short family, u8 mode, | 995 | unsigned short family, u8 mode, |
995 | u32 reqid, u8 proto, | 996 | u32 reqid, u8 proto, |
996 | const xfrm_address_t *daddr, | 997 | const xfrm_address_t *daddr, |
997 | const xfrm_address_t *saddr, int create) | 998 | const xfrm_address_t *saddr, |
999 | int create) | ||
998 | { | 1000 | { |
999 | unsigned int h = xfrm_dst_hash(net, daddr, saddr, reqid, family); | 1001 | unsigned int h = xfrm_dst_hash(net, daddr, saddr, reqid, family); |
1000 | struct xfrm_state *x; | 1002 | struct xfrm_state *x; |
@@ -1399,9 +1401,9 @@ xfrm_state_lookup_byaddr(struct net *net, u32 mark, | |||
1399 | EXPORT_SYMBOL(xfrm_state_lookup_byaddr); | 1401 | EXPORT_SYMBOL(xfrm_state_lookup_byaddr); |
1400 | 1402 | ||
1401 | struct xfrm_state * | 1403 | struct xfrm_state * |
1402 | xfrm_find_acq(struct net *net, struct xfrm_mark *mark, u8 mode, u32 reqid, u8 proto, | 1404 | xfrm_find_acq(struct net *net, const struct xfrm_mark *mark, u8 mode, u32 reqid, |
1403 | const xfrm_address_t *daddr, const xfrm_address_t *saddr, | 1405 | u8 proto, const xfrm_address_t *daddr, |
1404 | int create, unsigned short family) | 1406 | const xfrm_address_t *saddr, int create, unsigned short family) |
1405 | { | 1407 | { |
1406 | struct xfrm_state *x; | 1408 | struct xfrm_state *x; |
1407 | 1409 | ||