GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-17 20:29:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[NET] NEIGHBOUR: Extract hash/lookup functions for pneigh entries.

Browse source 
Extract hash function for pneigh entries from pneigh_lookup(),
__pneigh_lookup() and pneigh_delete() as pneigh_hash().
Extract core of pneigh_lookup() and __pneigh_lookup() as
__pneigh_lookup_1().

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
This commit is contained in:
YOSHIFUJI Hideaki 2008-03-28 12:46:53 +09:00
parent 0a204500f9
commit be01d655d9
1 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
net/core/neighbour.c
View file

@ -472,26 +472,40 @@ out_neigh_release:
} }
EXPORT_SYMBOL(neigh_create); EXPORT_SYMBOL(neigh_create);
struct pneigh_entry *__pneigh_lookup(struct neigh_table *tbl, static u32 pneigh_hash(const void *pkey, int key_len)
struct net *net, const void *pkey, struct net_device *dev)
{ {
struct pneigh_entry *n;
int key_len = tbl->key_len;
u32 hash_val = *(u32 *)(pkey + key_len - 4); u32 hash_val = *(u32 *)(pkey + key_len - 4);
hash_val ^= (hash_val >> 16); hash_val ^= (hash_val >> 16);
hash_val ^= hash_val >> 8; hash_val ^= hash_val >> 8;
hash_val ^= hash_val >> 4; hash_val ^= hash_val >> 4;
hash_val &= PNEIGH_HASHMASK; hash_val &= PNEIGH_HASHMASK;
return hash_val;
}
for (n = tbl->phash_buckets[hash_val]; n; n = n->next) { static struct pneigh_entry *__pneigh_lookup_1(struct pneigh_entry *n,
struct net *net,
const void *pkey,
int key_len,
struct net_device *dev)
{
while (n) {
if (!memcmp(n->key, pkey, key_len) && if (!memcmp(n->key, pkey, key_len) &&
(pneigh_net(n) == net) && net_eq(pneigh_net(n), net) &&
(n->dev == dev || !n->dev)) (n->dev == dev || !n->dev))
break;
}
return n; return n;
n = n->next;
}
return NULL;
}
struct pneigh_entry *__pneigh_lookup(struct neigh_table *tbl,
struct net *net, const void *pkey, struct net_device *dev)
{
int key_len = tbl->key_len;
u32 hash_val = pneigh_hash(pkey, key_len);
return __pneigh_lookup_1(tbl->phash_buckets[hash_val],
net, pkey, key_len, dev);
} }
EXPORT_SYMBOL_GPL(__pneigh_lookup); EXPORT_SYMBOL_GPL(__pneigh_lookup);
@ -501,26 +515,14 @@ struct pneigh_entry * pneigh_lookup(struct neigh_table *tbl,
{ {
struct pneigh_entry *n; struct pneigh_entry *n;
int key_len = tbl->key_len; int key_len = tbl->key_len;
u32 hash_val = *(u32 *)(pkey + key_len - 4); u32 hash_val = pneigh_hash(pkey, key_len);
hash_val ^= (hash_val >> 16);
hash_val ^= hash_val >> 8;
hash_val ^= hash_val >> 4;
hash_val &= PNEIGH_HASHMASK;
read_lock_bh(&tbl->lock); read_lock_bh(&tbl->lock);
n = __pneigh_lookup_1(tbl->phash_buckets[hash_val],
net, pkey, key_len, dev);
read_unlock_bh(&tbl->lock);
for (n = tbl->phash_buckets[hash_val]; n; n = n->next) { if (n || !creat)
if (!memcmp(n->key, pkey, key_len) &&
net_eq(pneigh_net(n), net) &&
(n->dev == dev || !n->dev)) {
read_unlock_bh(&tbl->lock);
goto out;
}
}
read_unlock_bh(&tbl->lock);
n = NULL;
if (!creat)
goto out; goto out;
ASSERT_RTNL(); ASSERT_RTNL();
@ -561,12 +563,7 @@ int pneigh_delete(struct neigh_table *tbl, struct net *net, const void *pkey,
{ {
struct pneigh_entry *n, **np; struct pneigh_entry *n, **np;
int key_len = tbl->key_len; int key_len = tbl->key_len;
u32 hash_val = *(u32 *)(pkey + key_len - 4); u32 hash_val = pneigh_hash(pkey, key_len);
hash_val ^= (hash_val >> 16);
hash_val ^= hash_val >> 8;
hash_val ^= hash_val >> 4;
hash_val &= PNEIGH_HASHMASK;
write_lock_bh(&tbl->lock); write_lock_bh(&tbl->lock);
for (np = &tbl->phash_buckets[hash_val]; (n = *np) != NULL; for (np = &tbl->phash_buckets[hash_val]; (n = *np) != NULL;