aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/udplite.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-03-22 19:51:21 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-22 19:51:21 -0400
commit6ba5a3c52da00015e739469e3b00cd6d0d4c5c67 (patch)
tree0cbccb2dac9307cec25176eb94ff4f406a2061f7 /net/ipv4/udplite.c
parent39d8cda76cfb1178455f9d196b39e773878e6c05 (diff)
[UDP]: Make full use of proto.h.udp_hash innovation.
After this we have only udp_lib_get_port to get the port and two stubs for ipv4 and ipv6. No difference in udp and udplite except for initialized h.udp_hash member. I tried to find a graceful way to drop the only difference between udp_v4_get_port and udp_v6_get_port (i.e. the rcv_saddr comparison routine), but adding one more callback on the struct proto didn't appear such :( Maybe later. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udplite.c')
-rw-r--r--net/ipv4/udplite.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 2469b5104587..8d42e344b043 100644
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -17,17 +17,6 @@ DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics) __read_mostly;
17 17
18struct hlist_head udplite_hash[UDP_HTABLE_SIZE]; 18struct hlist_head udplite_hash[UDP_HTABLE_SIZE];
19 19
20int udplite_get_port(struct sock *sk, unsigned short p,
21 int (*c)(const struct sock *, const struct sock *))
22{
23 return __udp_lib_get_port(sk, p, udplite_hash, c);
24}
25
26static int udplite_v4_get_port(struct sock *sk, unsigned short snum)
27{
28 return udplite_get_port(sk, snum, ipv4_rcv_saddr_equal);
29}
30
31static int udplite_rcv(struct sk_buff *skb) 20static int udplite_rcv(struct sk_buff *skb)
32{ 21{
33 return __udp4_lib_rcv(skb, udplite_hash, IPPROTO_UDPLITE); 22 return __udp4_lib_rcv(skb, udplite_hash, IPPROTO_UDPLITE);
@@ -63,8 +52,9 @@ struct proto udplite_prot = {
63 .backlog_rcv = udp_queue_rcv_skb, 52 .backlog_rcv = udp_queue_rcv_skb,
64 .hash = udp_lib_hash, 53 .hash = udp_lib_hash,
65 .unhash = udp_lib_unhash, 54 .unhash = udp_lib_unhash,
66 .get_port = udplite_v4_get_port, 55 .get_port = udp_v4_get_port,
67 .obj_size = sizeof(struct udp_sock), 56 .obj_size = sizeof(struct udp_sock),
57 .h.udp_hash = udplite_hash,
68#ifdef CONFIG_COMPAT 58#ifdef CONFIG_COMPAT
69 .compat_setsockopt = compat_udp_setsockopt, 59 .compat_setsockopt = compat_udp_setsockopt,
70 .compat_getsockopt = compat_udp_getsockopt, 60 .compat_getsockopt = compat_udp_getsockopt,
@@ -118,4 +108,3 @@ out_register_err:
118 108
119EXPORT_SYMBOL(udplite_hash); 109EXPORT_SYMBOL(udplite_hash);
120EXPORT_SYMBOL(udplite_prot); 110EXPORT_SYMBOL(udplite_prot);
121EXPORT_SYMBOL(udplite_get_port);