1 files changed, 37 insertions, 25 deletions

diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 001b881ca36f..72ce26b6c4d3 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;
 
 struct hlist_head       udplite_hash[UDP_HTABLE_SIZE];
 
-int udplite_get_port(struct sock *sk, unsigned short p,
-                     int (*c)(const struct sock *, const struct sock *))
-{
-        return  __udp_lib_get_port(sk, p, udplite_hash, c);
-}
-
-static int udplite_v4_get_port(struct sock *sk, unsigned short snum)
-{
-        return udplite_get_port(sk, snum, ipv4_rcv_saddr_equal);
-}
-
 static int udplite_rcv(struct sk_buff *skb)
 {
         return __udp4_lib_rcv(skb, udplite_hash, IPPROTO_UDPLITE);
@@ -42,10 +31,9 @@ static	struct net_protocol udplite_protocol = {
         .handler        = udplite_rcv,
         .err_handler    = udplite_err,
         .no_policy      = 1,
+        .netns_ok       = 1,
 };
 
-DEFINE_PROTO_INUSE(udplite)
-
 struct proto    udplite_prot = {
         .name              = "UDP-Lite",
         .owner             = THIS_MODULE,
@@ -63,13 +51,13 @@ 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 = {
@@ -83,15 +71,42 @@ static struct inet_protosw udplite4_protosw = {
 };
 
 #ifdef CONFIG_PROC_FS
-static struct file_operations udplite4_seq_fops;
 static struct udp_seq_afinfo udplite4_seq_afinfo = {
-        .owner          = THIS_MODULE,
         .name           = "udplite",
         .family         = AF_INET,
         .hashtable      = udplite_hash,
-        .seq_show       = udp4_seq_show,
-        .seq_fops       = &udplite4_seq_fops,
+        .seq_fops       = {
+                .owner  =       THIS_MODULE,
+        },
+        .seq_ops        = {
+                .show           = udp4_seq_show,
+        },
+};
+
+static int udplite4_proc_init_net(struct net *net)
+{
+        return udp_proc_register(net, &udplite4_seq_afinfo);
+}
+
+static void udplite4_proc_exit_net(struct net *net)
+{
+        udp_proc_unregister(net, &udplite4_seq_afinfo);
+}
+
+static struct pernet_operations udplite4_net_ops = {
+        .init = udplite4_proc_init_net,
+        .exit = udplite4_proc_exit_net,
 };
+
+static __init int udplite4_proc_init(void)
+{
+        return register_pernet_subsys(&udplite4_net_ops);
+}
+#else
+static inline int udplite4_proc_init(void)
+{
+        return 0;
+}
 #endif
 
 void __init udplite4_register(void)
@@ -104,18 +119,15 @@ 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__);
-#endif
+        if (udplite4_proc_init())
+                printk(KERN_ERR "%s: Cannot register /proc!\n", __func__);
         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);