[XFRM]: Do not add a state whose SPI is zero to the SPI hash.

[linux-2.6-omap-h63xx.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 4147fe4bf41d12adeb0a08eeb1a2ee39fdc7203f..1bc4167e0da8da20c2364c14ea48b73a0cca28df 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -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)
 {