diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-06-16 20:12:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-16 20:12:29 -0400 |
commit | 19c7578fb22b0aef103222cae9b522f03ae489d6 (patch) | |
tree | 645365b1bfb70bf758633934660608be180f07f0 /net/ipv4/udp.c | |
parent | e31634931d00081c75e3fb3f3ec51a50dbf108bb (diff) |
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>
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r-- | net/ipv4/udp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 6b0acb438f34..11eabf136144 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -134,7 +134,7 @@ static inline int __udp_lib_lport_inuse(struct net *net, __u16 num, | |||
134 | struct sock *sk; | 134 | struct sock *sk; |
135 | struct hlist_node *node; | 135 | struct hlist_node *node; |
136 | 136 | ||
137 | sk_for_each(sk, node, &udptable[udp_hashfn(num)]) | 137 | sk_for_each(sk, node, &udptable[udp_hashfn(net, num)]) |
138 | if (net_eq(sock_net(sk), net) && sk->sk_hash == num) | 138 | if (net_eq(sock_net(sk), net) && sk->sk_hash == num) |
139 | return 1; | 139 | return 1; |
140 | return 0; | 140 | return 0; |
@@ -174,7 +174,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum, | |||
174 | for (i = 0; i < UDP_HTABLE_SIZE; i++) { | 174 | for (i = 0; i < UDP_HTABLE_SIZE; i++) { |
175 | int size = 0; | 175 | int size = 0; |
176 | 176 | ||
177 | head = &udptable[udp_hashfn(rover)]; | 177 | head = &udptable[udp_hashfn(net, rover)]; |
178 | if (hlist_empty(head)) | 178 | if (hlist_empty(head)) |
179 | goto gotit; | 179 | goto gotit; |
180 | 180 | ||
@@ -211,7 +211,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum, | |||
211 | gotit: | 211 | gotit: |
212 | snum = rover; | 212 | snum = rover; |
213 | } else { | 213 | } else { |
214 | head = &udptable[udp_hashfn(snum)]; | 214 | head = &udptable[udp_hashfn(net, snum)]; |
215 | 215 | ||
216 | sk_for_each(sk2, node, head) | 216 | sk_for_each(sk2, node, head) |
217 | if (sk2->sk_hash == snum && | 217 | if (sk2->sk_hash == snum && |
@@ -227,7 +227,7 @@ gotit: | |||
227 | inet_sk(sk)->num = snum; | 227 | inet_sk(sk)->num = snum; |
228 | sk->sk_hash = snum; | 228 | sk->sk_hash = snum; |
229 | if (sk_unhashed(sk)) { | 229 | if (sk_unhashed(sk)) { |
230 | head = &udptable[udp_hashfn(snum)]; | 230 | head = &udptable[udp_hashfn(net, snum)]; |
231 | sk_add_node(sk, head); | 231 | sk_add_node(sk, head); |
232 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); | 232 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); |
233 | } | 233 | } |
@@ -264,7 +264,7 @@ static struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, | |||
264 | int badness = -1; | 264 | int badness = -1; |
265 | 265 | ||
266 | read_lock(&udp_hash_lock); | 266 | read_lock(&udp_hash_lock); |
267 | sk_for_each(sk, node, &udptable[udp_hashfn(hnum)]) { | 267 | sk_for_each(sk, node, &udptable[udp_hashfn(net, hnum)]) { |
268 | struct inet_sock *inet = inet_sk(sk); | 268 | struct inet_sock *inet = inet_sk(sk); |
269 | 269 | ||
270 | if (net_eq(sock_net(sk), net) && sk->sk_hash == hnum && | 270 | if (net_eq(sock_net(sk), net) && sk->sk_hash == hnum && |
@@ -1068,7 +1068,7 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb, | |||
1068 | int dif; | 1068 | int dif; |
1069 | 1069 | ||
1070 | read_lock(&udp_hash_lock); | 1070 | read_lock(&udp_hash_lock); |
1071 | sk = sk_head(&udptable[udp_hashfn(ntohs(uh->dest))]); | 1071 | sk = sk_head(&udptable[udp_hashfn(net, ntohs(uh->dest))]); |
1072 | dif = skb->dev->ifindex; | 1072 | dif = skb->dev->ifindex; |
1073 | sk = udp_v4_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif); | 1073 | sk = udp_v4_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif); |
1074 | if (sk) { | 1074 | if (sk) { |