tcp: accept socket after TCP_DEFER_ACCEPT period

[safe/jmp/linux-2.6] / net / ipv6 / xfrm6_tunnel.c

diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index 639fe8a..81a95c0 100644 (file)
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -140,12 +140,26 @@ __be32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr)
 
 EXPORT_SYMBOL(xfrm6_tunnel_spi_lookup);
 
+static int __xfrm6_tunnel_spi_check(u32 spi)
+{
+       struct xfrm6_tunnel_spi *x6spi;
+       int index = xfrm6_tunnel_spi_hash_byspi(spi);
+       struct hlist_node *pos;
+
+       hlist_for_each_entry(x6spi, pos,
+                            &xfrm6_tunnel_spi_byspi[index],
+                            list_byspi) {
+               if (x6spi->spi == spi)
+                       return -1;
+       }
+       return index;
+}
+
 static u32 __xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr)
 {
        u32 spi;
        struct xfrm6_tunnel_spi *x6spi;
-       struct hlist_node *pos;
-       unsigned index;
+       int index;
 
        if (xfrm6_tunnel_spi < XFRM6_TUNNEL_SPI_MIN ||
            xfrm6_tunnel_spi >= XFRM6_TUNNEL_SPI_MAX)
@@ -154,32 +168,19 @@ static u32 __xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr)
                xfrm6_tunnel_spi++;
 
        for (spi = xfrm6_tunnel_spi; spi <= XFRM6_TUNNEL_SPI_MAX; spi++) {
-               index = xfrm6_tunnel_spi_hash_byspi(spi);
-               hlist_for_each_entry(x6spi, pos,
-                                    &xfrm6_tunnel_spi_byspi[index],
-                                    list_byspi) {
-                       if (x6spi->spi == spi)
-                               goto try_next_1;
-               }
-               xfrm6_tunnel_spi = spi;
-               goto alloc_spi;
-try_next_1:;
+               index = __xfrm6_tunnel_spi_check(spi);
+               if (index >= 0)
+                       goto alloc_spi;
        }
        for (spi = XFRM6_TUNNEL_SPI_MIN; spi < xfrm6_tunnel_spi; spi++) {
-               index = xfrm6_tunnel_spi_hash_byspi(spi);
-               hlist_for_each_entry(x6spi, pos,
-                                    &xfrm6_tunnel_spi_byspi[index],
-                                    list_byspi) {
-                       if (x6spi->spi == spi)
-                               goto try_next_2;
-               }
-               xfrm6_tunnel_spi = spi;
-               goto alloc_spi;
-try_next_2:;
+               index = __xfrm6_tunnel_spi_check(spi);
+               if (index >= 0)
+                       goto alloc_spi;
        }
        spi = 0;
        goto out;
 alloc_spi:
+       xfrm6_tunnel_spi = spi;
        x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, GFP_ATOMIC);
        if (!x6spi)
                goto out;
@@ -261,7 +262,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb)
 }
 
 static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
-                           int type, int code, int offset, __be32 info)
+                           u8 type, u8 code, int offset, __be32 info)
 {
        /* xfrm6_tunnel native err handling */
        switch (type) {
@@ -344,24 +345,23 @@ static struct xfrm6_tunnel xfrm46_tunnel_handler = {
 static int __init xfrm6_tunnel_init(void)
 {
        if (xfrm_register_type(&xfrm6_tunnel_type, AF_INET6) < 0)
-               return -EAGAIN;
-
-       if (xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6)) {
-               xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
-               return -EAGAIN;
-       }
-       if (xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET)) {
-               xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
-               xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
-               return -EAGAIN;
-       }
-       if (xfrm6_tunnel_spi_init() < 0) {
-               xfrm6_tunnel_deregister(&xfrm46_tunnel_handler, AF_INET);
-               xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
-               xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
-               return -EAGAIN;
-       }
+               goto err;
+       if (xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6))
+               goto unreg;
+       if (xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET))
+               goto dereg6;
+       if (xfrm6_tunnel_spi_init() < 0)
+               goto dereg46;
        return 0;
+
+dereg46:
+       xfrm6_tunnel_deregister(&xfrm46_tunnel_handler, AF_INET);
+dereg6:
+       xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
+unreg:
+       xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
+err:
+       return -EAGAIN;
 }
 
 static void __exit xfrm6_tunnel_fini(void)