udp: add struct net argument to udp_hashfn
Every caller already has this one. The new argument is currently
unused, but this will be fixed shortly.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/linux/udp.h b/include/linux/udp.h
index 9c94312..3deccac 100644
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -46,7 +46,7 @@
#define UDP_HTABLE_SIZE 128
-static inline int udp_hashfn(const unsigned num)
+static inline int udp_hashfn(struct net *net, const unsigned num)
{
return num & (UDP_HTABLE_SIZE - 1);
}
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 6b0acb4..11eabf1 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -134,7 +134,7 @@
struct sock *sk;
struct hlist_node *node;
- sk_for_each(sk, node, &udptable[udp_hashfn(num)])
+ sk_for_each(sk, node, &udptable[udp_hashfn(net, num)])
if (net_eq(sock_net(sk), net) && sk->sk_hash == num)
return 1;
return 0;
@@ -174,7 +174,7 @@
for (i = 0; i < UDP_HTABLE_SIZE; i++) {
int size = 0;
- head = &udptable[udp_hashfn(rover)];
+ head = &udptable[udp_hashfn(net, rover)];
if (hlist_empty(head))
goto gotit;
@@ -211,7 +211,7 @@
gotit:
snum = rover;
} else {
- head = &udptable[udp_hashfn(snum)];
+ head = &udptable[udp_hashfn(net, snum)];
sk_for_each(sk2, node, head)
if (sk2->sk_hash == snum &&
@@ -227,7 +227,7 @@
inet_sk(sk)->num = snum;
sk->sk_hash = snum;
if (sk_unhashed(sk)) {
- head = &udptable[udp_hashfn(snum)];
+ head = &udptable[udp_hashfn(net, snum)];
sk_add_node(sk, head);
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
}
@@ -264,7 +264,7 @@
int badness = -1;
read_lock(&udp_hash_lock);
- sk_for_each(sk, node, &udptable[udp_hashfn(hnum)]) {
+ sk_for_each(sk, node, &udptable[udp_hashfn(net, hnum)]) {
struct inet_sock *inet = inet_sk(sk);
if (net_eq(sock_net(sk), net) && sk->sk_hash == hnum &&
@@ -1068,7 +1068,7 @@
int dif;
read_lock(&udp_hash_lock);
- sk = sk_head(&udptable[udp_hashfn(ntohs(uh->dest))]);
+ sk = sk_head(&udptable[udp_hashfn(net, ntohs(uh->dest))]);
dif = skb->dev->ifindex;
sk = udp_v4_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif);
if (sk) {
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 80fb72c..432edaa 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -65,7 +65,7 @@
int badness = -1;
read_lock(&udp_hash_lock);
- sk_for_each(sk, node, &udptable[udp_hashfn(hnum)]) {
+ sk_for_each(sk, node, &udptable[udp_hashfn(net, hnum)]) {
struct inet_sock *inet = inet_sk(sk);
if (net_eq(sock_net(sk), net) && sk->sk_hash == hnum &&
@@ -362,7 +362,7 @@
int dif;
read_lock(&udp_hash_lock);
- sk = sk_head(&udptable[udp_hashfn(ntohs(uh->dest))]);
+ sk = sk_head(&udptable[udp_hashfn(net, ntohs(uh->dest))]);
dif = inet6_iif(skb);
sk = udp_v6_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif);
if (!sk) {