diff options
Diffstat (limited to 'net/xfrm/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 91b02687db52..a35f9e4ede26 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -227,7 +227,7 @@ static inline unsigned long make_jiffies(long secs) | |||
227 | if (secs >= (MAX_SCHEDULE_TIMEOUT-1)/HZ) | 227 | if (secs >= (MAX_SCHEDULE_TIMEOUT-1)/HZ) |
228 | return MAX_SCHEDULE_TIMEOUT-1; | 228 | return MAX_SCHEDULE_TIMEOUT-1; |
229 | else | 229 | else |
230 | return secs*HZ; | 230 | return secs*HZ; |
231 | } | 231 | } |
232 | 232 | ||
233 | static void xfrm_timer_handler(unsigned long data) | 233 | static void xfrm_timer_handler(unsigned long data) |
@@ -523,7 +523,7 @@ static void xfrm_hash_grow_check(int have_hash_collision) | |||
523 | } | 523 | } |
524 | 524 | ||
525 | struct xfrm_state * | 525 | struct xfrm_state * |
526 | xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | 526 | xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, |
527 | struct flowi *fl, struct xfrm_tmpl *tmpl, | 527 | struct flowi *fl, struct xfrm_tmpl *tmpl, |
528 | struct xfrm_policy *pol, int *err, | 528 | struct xfrm_policy *pol, int *err, |
529 | unsigned short family) | 529 | unsigned short family) |
@@ -534,7 +534,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
534 | int acquire_in_progress = 0; | 534 | int acquire_in_progress = 0; |
535 | int error = 0; | 535 | int error = 0; |
536 | struct xfrm_state *best = NULL; | 536 | struct xfrm_state *best = NULL; |
537 | 537 | ||
538 | spin_lock_bh(&xfrm_state_lock); | 538 | spin_lock_bh(&xfrm_state_lock); |
539 | hlist_for_each_entry(x, entry, xfrm_state_bydst+h, bydst) { | 539 | hlist_for_each_entry(x, entry, xfrm_state_bydst+h, bydst) { |
540 | if (x->props.family == family && | 540 | if (x->props.family == family && |
@@ -570,7 +570,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
570 | acquire_in_progress = 1; | 570 | acquire_in_progress = 1; |
571 | } else if (x->km.state == XFRM_STATE_ERROR || | 571 | } else if (x->km.state == XFRM_STATE_ERROR || |
572 | x->km.state == XFRM_STATE_EXPIRED) { | 572 | x->km.state == XFRM_STATE_EXPIRED) { |
573 | if (xfrm_selector_match(&x->sel, fl, family) && | 573 | if (xfrm_selector_match(&x->sel, fl, family) && |
574 | security_xfrm_state_pol_flow_match(x, pol, fl)) | 574 | security_xfrm_state_pol_flow_match(x, pol, fl)) |
575 | error = -ESRCH; | 575 | error = -ESRCH; |
576 | } | 576 | } |
@@ -866,7 +866,7 @@ struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, int *errp) | |||
866 | } | 866 | } |
867 | x->props.calgo = orig->props.calgo; | 867 | x->props.calgo = orig->props.calgo; |
868 | 868 | ||
869 | if (orig->encap) { | 869 | if (orig->encap) { |
870 | x->encap = kmemdup(orig->encap, sizeof(*x->encap), GFP_KERNEL); | 870 | x->encap = kmemdup(orig->encap, sizeof(*x->encap), GFP_KERNEL); |
871 | if (!x->encap) | 871 | if (!x->encap) |
872 | goto error; | 872 | goto error; |
@@ -947,7 +947,7 @@ struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m) | |||
947 | } | 947 | } |
948 | } | 948 | } |
949 | 949 | ||
950 | return NULL; | 950 | return NULL; |
951 | } | 951 | } |
952 | EXPORT_SYMBOL(xfrm_migrate_state_find); | 952 | EXPORT_SYMBOL(xfrm_migrate_state_find); |
953 | 953 | ||
@@ -1121,8 +1121,8 @@ xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
1121 | EXPORT_SYMBOL(xfrm_state_lookup_byaddr); | 1121 | EXPORT_SYMBOL(xfrm_state_lookup_byaddr); |
1122 | 1122 | ||
1123 | struct xfrm_state * | 1123 | struct xfrm_state * |
1124 | xfrm_find_acq(u8 mode, u32 reqid, u8 proto, | 1124 | xfrm_find_acq(u8 mode, u32 reqid, u8 proto, |
1125 | xfrm_address_t *daddr, xfrm_address_t *saddr, | 1125 | xfrm_address_t *daddr, xfrm_address_t *saddr, |
1126 | int create, unsigned short family) | 1126 | int create, unsigned short family) |
1127 | { | 1127 | { |
1128 | struct xfrm_state *x; | 1128 | struct xfrm_state *x; |
@@ -1738,7 +1738,7 @@ error: | |||
1738 | } | 1738 | } |
1739 | 1739 | ||
1740 | EXPORT_SYMBOL(xfrm_init_state); | 1740 | EXPORT_SYMBOL(xfrm_init_state); |
1741 | 1741 | ||
1742 | void __init xfrm_state_init(void) | 1742 | void __init xfrm_state_init(void) |
1743 | { | 1743 | { |
1744 | unsigned int sz; | 1744 | unsigned int sz; |