Merge branch 'ipv6_stable_privacy_address'

[firefly-linux-kernel-4.4.55.git] / include / net / ndisc.h

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 6bbda34d5e59d030a1e2d69e93cda754d06ae5c0..b3a7751251b4cb9ce1a7fcb1d3999a63f4ff5074 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -156,24 +156,7 @@ static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, _
 
 static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey)
 {
-       struct neigh_hash_table *nht;
-       const u32 *p32 = pkey;
-       struct neighbour *n;
-       u32 hash_val;
-
-       nht = rcu_dereference_bh(nd_tbl.nht);
-       hash_val = ndisc_hashfn(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift);
-       for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
-            n != NULL;
-            n = rcu_dereference_bh(n->next)) {
-               u32 *n32 = (u32 *) n->primary_key;
-               if (n->dev == dev &&
-                   ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
-                    (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0)
-                       return n;
-       }
-
-       return NULL;
+       return ___neigh_lookup_noref(&nd_tbl, neigh_key_eq128, ndisc_hashfn, pkey, dev);
 }
 
 static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, const void *pkey)