diff options
| author | David S. Miller | 2008-12-24 02:56:23 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-12-24 02:56:23 +0100 |
| commit | 6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch) | |
| tree | d98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /net/bluetooth | |
| parent | net: Remove unused netdev arg from some NAPI interfaces. (diff) | |
| parent | ppp: fix segfaults introduced by netdev_priv changes (diff) | |
| download | kernel-qcow2-linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.gz kernel-qcow2-linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.xz kernel-qcow2-linux-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/bluetooth')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 37c640d1c3fd..acd84fd524b8 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; |