summaryrefslogtreecommitdiff
path: root/net/socket.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-23 17:56:23 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-23 17:56:23 -0800
commit6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch)
treed98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /net/socket.c
parent908a7a16b852ffd618a9127be8d62432182d81b4 (diff)
parent739840d529eb7505d3cbfe9d468bf1440c9a8e27 (diff)
downloadlinux-3.10-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.gz
linux-3.10-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.bz2
linux-3.10-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ppp_generic.c
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c
index e9d65ea2687..43021f9463f 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2306,6 +2306,7 @@ int kernel_accept(struct socket *sock, struct socket **newsock, int flags)
}
(*newsock)->ops = sock->ops;
+ __module_get((*newsock)->ops->owner);
done:
return err;