===== net/xfrm/xfrm_state.c 1.49 vs edited =====
--- 1.49/net/xfrm/xfrm_state.c	2004-07-30 22:12:11 +10:00
+++ edited/net/xfrm/xfrm_state.c	2004-07-31 11:56:29 +10:00
@@ -624,11 +624,12 @@
 		for (h=0; h<maxspi-minspi+1; h++) {
 			spi = minspi + net_random()%(maxspi-minspi+1);
 			x0 = xfrm_state_lookup(&x->id.daddr, htonl(spi), x->id.proto, x->props.family);
-			if (x0 == NULL)
+			if (x0 == NULL) {
+				x->id.spi = htonl(spi);
 				break;
+			}
 			xfrm_state_put(x0);
 		}
-		x->id.spi = htonl(spi);
 	}
 	if (x->id.spi) {
 		spin_lock_bh(&xfrm_state_lock);