[IPV4] IPIP: Unify code path to get hash array index. (87d1a164) · Commits · e / devices / android_kernel_fairphone_FP3

net/ipv4/ipip.c

+8 −14

Original line number	Diff line number	Diff line
		@@ -157,10 +157,10 @@ static struct ip_tunnel * ipip_tunnel_lookup(__be32 remote, __be32 local)
		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 local = t->parms.iph.saddr;
		__be32 remote = parms->iph.daddr;
		__be32 local = parms->iph.saddr;
		unsigned h = 0;
		int prio = 0;

		@@ -175,6 +175,10 @@ static struct ip_tunnel *ipip_bucket(struct ip_tunnel t)
		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)
		{
		@@ -206,19 +210,9 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c
		__be32 local = parms->iph.saddr;
		struct ip_tunnel t, tp, nt;
		struct net_device *dev;
		unsigned h = 0;
		int prio = 0;
		char name[IFNAMSIZ];

		if (remote) {
		prio \|= 2;
		h ^= HASH(remote);
		}
		if (local) {
		prio \|= 1;
		h ^= HASH(local);
		}
		for (tp = &tunnels[prio][h]; (t = *tp) != NULL; tp = &t->next) {
		for (tp = __ipip_bucket(parms); (t = *tp) != NULL; tp = &t->next) {
		if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr)
		return t;
		}