p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipv4: remove the useless argument from ip_tunnel_hash() 

Since commit c544193214("GRE: Refactor GRE tunneling code")
introduced function ip_tunnel_hash(), the argument itn is no
longer in use, so remove it.

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Duan Jiong 2014-01-19 16:43:42 +08:00 committed by David S. Miller
parent 8d78316386
commit 967680e027
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ipv4/ip_tunnel.c
View File

@ -61,8 +61,7 @@
#include <net/ip6_route.h> #include <net/ip6_route.h>
#endif #endif
static unsigned int ip_tunnel_hash(struct ip_tunnel_net *itn, static unsigned int ip_tunnel_hash(__be32 key, __be32 remote)
__be32 key, __be32 remote)
{ {
return hash_32((__force u32)key ^ (__force u32)remote, return hash_32((__force u32)key ^ (__force u32)remote,
IP_TNL_HASH_BITS); IP_TNL_HASH_BITS);
@ -204,7 +203,7 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,
struct ip_tunnel *t, *cand = NULL; struct ip_tunnel *t, *cand = NULL;
struct hlist_head *head; struct hlist_head *head;
hash = ip_tunnel_hash(itn, key, remote); hash = ip_tunnel_hash(key, remote);
head = &itn->tunnels[hash]; head = &itn->tunnels[hash];
hlist_for_each_entry_rcu(t, head, hash_node) { hlist_for_each_entry_rcu(t, head, hash_node) {
@ -236,7 +235,7 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,
cand = t; cand = t;
} }
hash = ip_tunnel_hash(itn, key, 0); hash = ip_tunnel_hash(key, 0);
head = &itn->tunnels[hash]; head = &itn->tunnels[hash];
hlist_for_each_entry_rcu(t, head, hash_node) { hlist_for_each_entry_rcu(t, head, hash_node) {
@ -292,7 +291,7 @@ static struct hlist_head *ip_bucket(struct ip_tunnel_net *itn,
else else
remote = 0; remote = 0;
h = ip_tunnel_hash(itn, parms->i_key, remote); h = ip_tunnel_hash(parms->i_key, remote);
return &itn->tunnels[h]; return &itn->tunnels[h];
} }