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

[net-next-2.6.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 72da57d6ab7b9852fd2ddc805df6b20b85501a68..abf3e2561521acc1ce82167b9edaf71eaf263ee9 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -502,6 +502,7 @@ static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
 const struct file_operations bad_sock_fops = {
        .owner = THIS_MODULE,
        .open = sock_no_open,
+       .llseek = noop_llseek,
 };
 
 /**