net: ip_sockglue.c add static, annotate ports' endianness

[~andy/linux] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 3e8d4e35c08f3892e615959f60b0855e72f348a1..d7128b761c8c90eb7d7dfe5b9ade45876bc08309 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -69,7 +69,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
-#include <linux/thread_info.h>
 #include <linux/wanrouter.h>
 #include <linux/if_bridge.h>
 #include <linux/if_frad.h>
@@ -990,7 +989,6 @@ static int sock_close(struct inode *inode, struct file *filp)
                printk(KERN_DEBUG "sock_close: NULL inode\n");
                return 0;
        }
-       sock_fasync(-1, filp, 0);
        sock_release(SOCKET_I(inode));
        return 0;
 }
@@ -1142,7 +1140,7 @@ static int __sock_create(struct net *net, int family, int type, int protocol,
 
        sock->type = type;
 
-#if defined(CONFIG_KMOD)
+#ifdef CONFIG_MODULES
        /* Attempt to load a protocol module if the find failed.
         *
         * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user