Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2014-12-03

1) Fix a set but not used warning. From Fabian Frederick.

2) Currently we make sequence number values available to userspace
   only if we use ESN. Make the sequence number values also available
   for non ESN states. From Zhi Ding.

3) Remove socket policy hashing. We don't need it because socket
   policies are always looked up via a linked list. From Herbert Xu.

4) After removing socket policy hashing, we can use __xfrm_policy_link
   in xfrm_policy_insert. From Herbert Xu.

5) Add a lookup method for vti6 tunnels with wildcard endpoints.
   I forgot this when I initially implemented vti6.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 17 insertions, 0 deletions

diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 16a7e81e3f99..ace10d0b3aac 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -95,6 +95,7 @@ vti6_tnl_lookup(struct net *net, const struct in6_addr *remote,
         unsigned int hash = HASH(remote, local);
         struct ip6_tnl *t;
         struct vti6_net *ip6n = net_generic(net, vti6_net_id);
+        struct in6_addr any;
 
         for_each_vti6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
                 if (ipv6_addr_equal(local, &t->parms.laddr) &&
@@ -102,6 +103,22 @@ vti6_tnl_lookup(struct net *net, const struct in6_addr *remote,
                     (t->dev->flags & IFF_UP))
                         return t;
         }
+
+        memset(&any, 0, sizeof(any));
+        hash = HASH(&any, local);
+        for_each_vti6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
+                if (ipv6_addr_equal(local, &t->parms.laddr) &&
+                    (t->dev->flags & IFF_UP))
+                        return t;
+        }
+
+        hash = HASH(remote, &any);
+        for_each_vti6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
+                if (ipv6_addr_equal(remote, &t->parms.raddr) &&
+                    (t->dev->flags & IFF_UP))
+                        return t;
+        }
+
         t = rcu_dereference(ip6n->tnls_wc[0]);
         if (t && (t->dev->flags & IFF_UP))
                 return t;