diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-23 17:56:23 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-23 17:56:23 -0800 |
| commit | 6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch) | |
| tree | d98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /net | |
| parent | 908a7a16b852ffd618a9127be8d62432182d81b4 (diff) | |
| parent | 739840d529eb7505d3cbfe9d468bf1440c9a8e27 (diff) | |
| download | op-kernel-dev-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.zip op-kernel-dev-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.gz | |
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')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 2 | ||||
| -rw-r--r-- | net/socket.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 37c640d..acd84fd 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -1781,8 +1781,6 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s) if (err < 0) return; - __module_get(nsock->ops->owner); - /* Set our callbacks */ nsock->sk->sk_data_ready = rfcomm_l2data_ready; nsock->sk->sk_state_change = rfcomm_l2state_change; diff --git a/net/socket.c b/net/socket.c index e9d65ea..43021f9 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; |
