diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-06-06 00:18:43 +0200 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-06-07 22:40:50 +0200 |
commit | df2bc459a3ad71f8b44c358bf7169acf9caf4acd (patch) | |
tree | 143206b16d59c723be3c2cf2375a33b2a9306280 /net/ipv4/udplite.c | |
parent | [AF_UNIX]: Fix stream recvmsg() race. (diff) | |
download | linux-df2bc459a3ad71f8b44c358bf7169acf9caf4acd.tar.xz linux-df2bc459a3ad71f8b44c358bf7169acf9caf4acd.zip |
[UDP]: Revert 2-pass hashing changes.
This reverts changesets:
6aaf47fa48d3c44280810b1b470261d340e4ed87
b7b5f487ab39bc10ed0694af35651a03d9cb97ff
de34ed91c4ffa4727964a832c46e624dd1495cf5
fc038410b4b1643766f8033f4940bcdb1dace633
There are still some correctness issues recently
discovered which do not have a known fix that doesn't
involve doing a full hash table scan on port bind.
So revert for now.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udplite.c')
-rw-r--r-- | net/ipv4/udplite.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c index 3653b32dce2d..f34fd686a8f1 100644 --- a/net/ipv4/udplite.c +++ b/net/ipv4/udplite.c @@ -19,15 +19,14 @@ struct hlist_head udplite_hash[UDP_HTABLE_SIZE]; static int udplite_port_rover; int udplite_get_port(struct sock *sk, unsigned short p, - const struct udp_get_port_ops *ops) + int (*c)(const struct sock *, const struct sock *)) { - return __udp_lib_get_port(sk, p, udplite_hash, - &udplite_port_rover, ops); + return __udp_lib_get_port(sk, p, udplite_hash, &udplite_port_rover, c); } static int udplite_v4_get_port(struct sock *sk, unsigned short snum) { - return udplite_get_port(sk, snum, &udp_ipv4_ops); + return udplite_get_port(sk, snum, ipv4_rcv_saddr_equal); } static int udplite_rcv(struct sk_buff *skb) |