diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-05-09 16:42:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-10 23:47:22 -0700 |
| commit | fc038410b4b1643766f8033f4940bcdb1dace633 (patch) | |
| tree | 3ee59190ecaa77061a9b64cdc09fcce6b6efc389 /net/ipv4/udplite.c | |
| parent | a2af421f1819946556c6f467b1efdd0dc84af4d5 (diff) | |
| download | op-kernel-dev-fc038410b4b1643766f8033f4940bcdb1dace633.zip op-kernel-dev-fc038410b4b1643766f8033f4940bcdb1dace633.tar.gz | |
[UDP]: Fix AF-specific references in AF-agnostic code.
__udp_lib_port_inuse() cannot make direct references to
inet_sk(sk)->rcv_saddr as that is ipv4 specific state and
this code is used by ipv6 too.
Use an operations vector to solve this, and this also paves
the way for ipv6 support for non-wild saddr hashing in UDP.
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, 4 insertions, 3 deletions
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c index f34fd68..3653b32 100644 --- a/net/ipv4/udplite.c +++ b/net/ipv4/udplite.c @@ -19,14 +19,15 @@ struct hlist_head udplite_hash[UDP_HTABLE_SIZE]; static int udplite_port_rover; int udplite_get_port(struct sock *sk, unsigned short p, - int (*c)(const struct sock *, const struct sock *)) + const struct udp_get_port_ops *ops) { - return __udp_lib_get_port(sk, p, udplite_hash, &udplite_port_rover, c); + return __udp_lib_get_port(sk, p, udplite_hash, + &udplite_port_rover, ops); } static int udplite_v4_get_port(struct sock *sk, unsigned short snum) { - return udplite_get_port(sk, snum, ipv4_rcv_saddr_equal); + return udplite_get_port(sk, snum, &udp_ipv4_ops); } static int udplite_rcv(struct sk_buff *skb) |
