Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-microblaze.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index feca4c9..f333d75 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2587,12 +2587,6 @@ int sock_no_getname(struct socket *sock, struct sockaddr *saddr,
 }
 EXPORT_SYMBOL(sock_no_getname);
 
-__poll_t sock_no_poll(struct file *file, struct socket *sock, poll_table *pt)
-{
-       return 0;
-}
-EXPORT_SYMBOL(sock_no_poll);
-
 int sock_no_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
        return -EOPNOTSUPP;
@@ -3459,22 +3453,10 @@ static const struct seq_operations proto_seq_ops = {
        .show   = proto_seq_show,
 };
 
-static int proto_seq_open(struct inode *inode, struct file *file)
-{
-       return seq_open_net(inode, file, &proto_seq_ops,
-                           sizeof(struct seq_net_private));
-}
-
-static const struct file_operations proto_seq_fops = {
-       .open           = proto_seq_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release_net,
-};
-
 static __net_init int proto_init_net(struct net *net)
 {
-       if (!proc_create("protocols", 0444, net->proc_net, &proto_seq_fops))
+       if (!proc_create_net("protocols", 0444, net->proc_net, &proto_seq_ops,
+                       sizeof(struct seq_net_private)))
                return -ENOMEM;
 
        return 0;