diff options
-rw-r--r-- | net/xfrm/xfrm_state.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 8a57a1ee538c..9d9ac7ca3dd4 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -754,7 +754,6 @@ static void xfrm_hash_grow_check(struct net *net, int have_hash_collision) | |||
754 | 754 | ||
755 | static void xfrm_state_look_at(struct xfrm_policy *pol, struct xfrm_state *x, | 755 | static void xfrm_state_look_at(struct xfrm_policy *pol, struct xfrm_state *x, |
756 | const struct flowi *fl, unsigned short family, | 756 | const struct flowi *fl, unsigned short family, |
757 | xfrm_address_t *daddr, xfrm_address_t *saddr, | ||
758 | struct xfrm_state **best, int *acq_in_progress, | 757 | struct xfrm_state **best, int *acq_in_progress, |
759 | int *error) | 758 | int *error) |
760 | { | 759 | { |
@@ -820,7 +819,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
820 | tmpl->mode == x->props.mode && | 819 | tmpl->mode == x->props.mode && |
821 | tmpl->id.proto == x->id.proto && | 820 | tmpl->id.proto == x->id.proto && |
822 | (tmpl->id.spi == x->id.spi || !tmpl->id.spi)) | 821 | (tmpl->id.spi == x->id.spi || !tmpl->id.spi)) |
823 | xfrm_state_look_at(pol, x, fl, encap_family, daddr, saddr, | 822 | xfrm_state_look_at(pol, x, fl, encap_family, |
824 | &best, &acquire_in_progress, &error); | 823 | &best, &acquire_in_progress, &error); |
825 | } | 824 | } |
826 | if (best) | 825 | if (best) |
@@ -836,7 +835,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
836 | tmpl->mode == x->props.mode && | 835 | tmpl->mode == x->props.mode && |
837 | tmpl->id.proto == x->id.proto && | 836 | tmpl->id.proto == x->id.proto && |
838 | (tmpl->id.spi == x->id.spi || !tmpl->id.spi)) | 837 | (tmpl->id.spi == x->id.spi || !tmpl->id.spi)) |
839 | xfrm_state_look_at(pol, x, fl, encap_family, daddr, saddr, | 838 | xfrm_state_look_at(pol, x, fl, encap_family, |
840 | &best, &acquire_in_progress, &error); | 839 | &best, &acquire_in_progress, &error); |
841 | } | 840 | } |
842 | 841 | ||