[IPV4] IPIP: Unify code path to get hash array index.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
This commit is contained in:
parent
420fe234ad
commit
87d1a164df
@ -157,10 +157,10 @@ static struct ip_tunnel * ipip_tunnel_lookup(__be32 remote, __be32 local)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct ip_tunnel **ipip_bucket(struct ip_tunnel *t)
|
static struct ip_tunnel **__ipip_bucket(struct ip_tunnel_parm *parms)
|
||||||
{
|
{
|
||||||
__be32 remote = t->parms.iph.daddr;
|
__be32 remote = parms->iph.daddr;
|
||||||
__be32 local = t->parms.iph.saddr;
|
__be32 local = parms->iph.saddr;
|
||||||
unsigned h = 0;
|
unsigned h = 0;
|
||||||
int prio = 0;
|
int prio = 0;
|
||||||
|
|
||||||
@ -175,6 +175,10 @@ static struct ip_tunnel **ipip_bucket(struct ip_tunnel *t)
|
|||||||
return &tunnels[prio][h];
|
return &tunnels[prio][h];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline struct ip_tunnel **ipip_bucket(struct ip_tunnel *t)
|
||||||
|
{
|
||||||
|
return __ipip_bucket(&t->parms);
|
||||||
|
}
|
||||||
|
|
||||||
static void ipip_tunnel_unlink(struct ip_tunnel *t)
|
static void ipip_tunnel_unlink(struct ip_tunnel *t)
|
||||||
{
|
{
|
||||||
@ -206,19 +210,9 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c
|
|||||||
__be32 local = parms->iph.saddr;
|
__be32 local = parms->iph.saddr;
|
||||||
struct ip_tunnel *t, **tp, *nt;
|
struct ip_tunnel *t, **tp, *nt;
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
unsigned h = 0;
|
|
||||||
int prio = 0;
|
|
||||||
char name[IFNAMSIZ];
|
char name[IFNAMSIZ];
|
||||||
|
|
||||||
if (remote) {
|
for (tp = __ipip_bucket(parms); (t = *tp) != NULL; tp = &t->next) {
|
||||||
prio |= 2;
|
|
||||||
h ^= HASH(remote);
|
|
||||||
}
|
|
||||||
if (local) {
|
|
||||||
prio |= 1;
|
|
||||||
h ^= HASH(local);
|
|
||||||
}
|
|
||||||
for (tp = &tunnels[prio][h]; (t = *tp) != NULL; tp = &t->next) {
|
|
||||||
if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr)
|
if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr)
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user