nfsd: Revert "svcrpc: take advantage of tcp autotuning"

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

diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index a4714d7..9084582 100644 (file)
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -58,10 +58,8 @@ EXPORT_SYMBOL(xfrm6_rcv);
 int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
                     xfrm_address_t *saddr, u8 proto)
 {
+       struct net *net = dev_net(skb->dev);
        struct xfrm_state *x = NULL;
-       int wildcard = 0;
-       xfrm_address_t *xany;
-       int nh = 0;
        int i = 0;
 
        /* Allocate new secpath or COW existing one. */
@@ -70,7 +68,7 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
 
                sp = secpath_dup(skb->sp);
                if (!sp) {
-                       XFRM_INC_STATS(LINUX_MIB_XFRMINERROR);
+                       XFRM_INC_STATS(net, LINUX_MIB_XFRMINERROR);
                        goto drop;
                }
                if (skb->sp)
@@ -79,14 +77,13 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
        }
 
        if (1 + skb->sp->len == XFRM_MAX_DEPTH) {
-               XFRM_INC_STATS(LINUX_MIB_XFRMINBUFFERERROR);
+               XFRM_INC_STATS(net, LINUX_MIB_XFRMINBUFFERERROR);
                goto drop;
        }
 
-       xany = (xfrm_address_t *)&in6addr_any;
-
        for (i = 0; i < 3; i++) {
                xfrm_address_t *dst, *src;
+
                switch (i) {
                case 0:
                        dst = daddr;
@@ -94,62 +91,39 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
                        break;
                case 1:
                        /* lookup state with wild-card source address */
-                       wildcard = 1;
                        dst = daddr;
-                       src = xany;
+                       src = (xfrm_address_t *)&in6addr_any;
                        break;
-               case 2:
                default:
                        /* lookup state with wild-card addresses */
-                       wildcard = 1; /* XXX */
-                       dst = xany;
-                       src = xany;
+                       dst = (xfrm_address_t *)&in6addr_any;
+                       src = (xfrm_address_t *)&in6addr_any;
                        break;
                }
 
-               x = xfrm_state_lookup_byaddr(dst, src, proto, AF_INET6);
+               x = xfrm_state_lookup_byaddr(net, dst, src, proto, AF_INET6);
                if (!x)
                        continue;
 
                spin_lock(&x->lock);
 
-               if (wildcard) {
-                       if ((x->props.flags & XFRM_STATE_WILDRECV) == 0) {
-                               spin_unlock(&x->lock);
-                               xfrm_state_put(x);
-                               x = NULL;
-                               continue;
-                       }
-               }
-
-               if (unlikely(x->km.state != XFRM_STATE_VALID)) {
+               if ((!i || (x->props.flags & XFRM_STATE_WILDRECV)) &&
+                   likely(x->km.state == XFRM_STATE_VALID) &&
+                   !xfrm_state_check_expire(x)) {
                        spin_unlock(&x->lock);
-                       xfrm_state_put(x);
-                       x = NULL;
-                       continue;
-               }
-               if (xfrm_state_check_expire(x)) {
+                       if (x->type->input(x, skb) > 0) {
+                               /* found a valid state */
+                               break;
+                       }
+               } else
                        spin_unlock(&x->lock);
-                       xfrm_state_put(x);
-                       x = NULL;
-                       continue;
-               }
-
-               spin_unlock(&x->lock);
-
-               nh = x->type->input(x, skb);
-               if (nh <= 0) {
-                       xfrm_state_put(x);
-                       x = NULL;
-                       continue;
-               }
 
-               /* Found a state */
-               break;
+               xfrm_state_put(x);
+               x = NULL;
        }
 
        if (!x) {
-               XFRM_INC_STATS(LINUX_MIB_XFRMINNOSTATES);
+               XFRM_INC_STATS(net, LINUX_MIB_XFRMINNOSTATES);
                xfrm_audit_state_notfound_simple(skb, AF_INET6);
                goto drop;
        }