V4L/DVB (4478): [av7110] Support Grundig DVB-T tuner for sub-system 13c2:0001

[linux-2.6] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index b5a3fcb9ed6dab6b6509ae9d7ccd4f5b442dabe1..1bc4167e0da8da20c2364c14ea48b73a0cca28df 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -147,7 +147,7 @@ static struct file_operations socket_file_ops = {
  */
 
 static DEFINE_SPINLOCK(net_family_lock);
-static const struct net_proto_family *net_families[NPROTO];
+static const struct net_proto_family *net_families[NPROTO] __read_mostly;
 
 /*
  *     Statistics counters of the socket lists
@@ -254,7 +254,6 @@ static struct inode *sock_alloc_inode(struct super_block *sb)
        ei->socket.ops = NULL;
        ei->socket.sk = NULL;
        ei->socket.file = NULL;
-       ei->socket.flags = 0;
 
        return &ei->vfs_inode;
 }
@@ -1338,7 +1337,7 @@ asmlinkage long sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen)
  *     ready for listening.
  */
 
-int sysctl_somaxconn = SOMAXCONN;
+int sysctl_somaxconn __read_mostly = SOMAXCONN;
 
 asmlinkage long sys_listen(int fd, int backlog)
 {
@@ -2080,7 +2079,7 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
  *     socket interface. The value ops->family coresponds to the
  *     socket system call protocol family.
  */
-int sock_register(struct net_proto_family *ops)
+int sock_register(const struct net_proto_family *ops)
 {
        int err;
 
@@ -2116,10 +2115,9 @@ int sock_register(struct net_proto_family *ops)
  *     a module then it needs to provide its own protection in
  *     the ops->create routine.
  */
-int sock_unregister(int family)
+void sock_unregister(int family)
 {
-       if (family < 0 || family >= NPROTO)
-               return -EINVAL;
+       BUG_ON(family < 0 || family >= NPROTO);
 
        spin_lock(&net_family_lock);
        net_families[family] = NULL;
@@ -2128,7 +2126,6 @@ int sock_unregister(int family)
        synchronize_rcu();
 
        printk(KERN_INFO "NET: Unregistered protocol family %d\n", family);
-       return 0;
 }
 
 static int __init sock_init(void)