[UDP]: Make full use of proto.h.udp_hash innovation.

[safe/jmp/linux-2.6] / net / ipv4 / udplite.c

diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 561de6d..8d42e34 100644 (file)
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -16,27 +16,15 @@
 DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics)   __read_mostly;
 
 struct hlist_head      udplite_hash[UDP_HTABLE_SIZE];
-static int             udplite_port_rover;
 
-__inline__ int udplite_get_port(struct sock *sk, unsigned short p,
-                       int (*c)(const struct sock *, const struct sock *))
+static int udplite_rcv(struct sk_buff *skb)
 {
-       return  __udp_lib_get_port(sk, p, udplite_hash, &udplite_port_rover, c);
+       return __udp4_lib_rcv(skb, udplite_hash, IPPROTO_UDPLITE);
 }
 
-static __inline__ int udplite_v4_get_port(struct sock *sk, unsigned short snum)
+static void udplite_err(struct sk_buff *skb, u32 info)
 {
-       return udplite_get_port(sk, snum, ipv4_rcv_saddr_equal);
-}
-
-__inline__ int udplite_rcv(struct sk_buff *skb)
-{
-       return __udp4_lib_rcv(skb, udplite_hash, 1);
-}
-
-__inline__ void udplite_err(struct sk_buff *skb, u32 info)
-{
-       return __udp4_lib_err(skb, info, udplite_hash);
+       __udp4_lib_err(skb, info, udplite_hash);
 }
 
 static struct net_protocol udplite_protocol = {
@@ -45,6 +33,8 @@ static        struct net_protocol udplite_protocol = {
        .no_policy      = 1,
 };
 
+DEFINE_PROTO_INUSE(udplite)
+
 struct proto   udplite_prot = {
        .name              = "UDP-Lite",
        .owner             = THIS_MODULE,
@@ -62,12 +52,14 @@ struct proto        udplite_prot = {
        .backlog_rcv       = udp_queue_rcv_skb,
        .hash              = udp_lib_hash,
        .unhash            = udp_lib_unhash,
-       .get_port          = udplite_v4_get_port,
+       .get_port          = udp_v4_get_port,
        .obj_size          = sizeof(struct udp_sock),
+       .h.udp_hash        = udplite_hash,
 #ifdef CONFIG_COMPAT
        .compat_setsockopt = compat_udp_setsockopt,
        .compat_getsockopt = compat_udp_getsockopt,
 #endif
+       REF_PROTO_INUSE(udplite)
 };
 
 static struct inet_protosw udplite4_protosw = {
@@ -103,17 +95,16 @@ void __init udplite4_register(void)
        inet_register_protosw(&udplite4_protosw);
 
 #ifdef CONFIG_PROC_FS
-       if (udp_proc_register(&udplite4_seq_afinfo)) /* udplite4_proc_init() */
-               printk(KERN_ERR "%s: Cannot register /proc!\n", __FUNCTION__);
+       if (udp_proc_register(&init_net, &udplite4_seq_afinfo))
+               printk(KERN_ERR "%s: Cannot register /proc!\n", __func__);
 #endif
        return;
 
 out_unregister_proto:
        proto_unregister(&udplite_prot);
 out_register_err:
-       printk(KERN_CRIT "%s: Cannot add UDP-Lite protocol.\n", __FUNCTION__);
+       printk(KERN_CRIT "%s: Cannot add UDP-Lite protocol.\n", __func__);
 }
 
 EXPORT_SYMBOL(udplite_hash);
 EXPORT_SYMBOL(udplite_prot);
-EXPORT_SYMBOL(udplite_get_port);