===== net/ipv4/xfrm4_state.c 1.10 vs edited ===== --- 1.10/net/ipv4/xfrm4_state.c 2004-07-09 20:19:08 +10:00 +++ edited/net/ipv4/xfrm4_state.c 2004-07-30 21:26:21 +10:00 @@ -74,11 +74,8 @@ proto == x->id.proto && saddr->a4 == x->props.saddr.a4 && reqid == x->props.reqid && - x->km.state == XFRM_STATE_ACQ) { - if (!x0) - x0 = x; - if (x->id.spi) - continue; + x->km.state == XFRM_STATE_ACQ && + !x->id.spi) { x0 = x; break; } ===== net/ipv6/xfrm6_state.c 1.11 vs edited ===== --- 1.11/net/ipv6/xfrm6_state.c 2004-05-27 18:57:44 +10:00 +++ edited/net/ipv6/xfrm6_state.c 2004-07-30 21:27:07 +10:00 @@ -81,11 +81,8 @@ proto == x->id.proto && !ipv6_addr_cmp((struct in6_addr *)saddr, (struct in6_addr *)x->props.saddr.a6) && reqid == x->props.reqid && - x->km.state == XFRM_STATE_ACQ) { - if (!x0) - x0 = x; - if (x->id.spi) - continue; + x->km.state == XFRM_STATE_ACQ && + !x->id.spi) { x0 = x; break; }