diff options
| author | David S. Miller <[email protected]> | 2011-04-22 20:21:38 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2011-04-22 20:21:38 +0000 |
| commit | 1ed3aad141fe595673c20225a9e004730088be52 (patch) | |
| tree | dec75e69b602e677ba0e5231f2d3036663fbd66a /net/bluetooth/sco.c | |
| parent | Revert "bridge: Forward reserved group addresses if !STP" (diff) | |
| parent | iwl4965: fix skb usage after free (diff) | |
| download | kernel-1ed3aad141fe595673c20225a9e004730088be52.tar.gz kernel-1ed3aad141fe595673c20225a9e004730088be52.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/bluetooth/sco.c')
| -rw-r--r-- | net/bluetooth/sco.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 42fdffd1d76c..94954c74f6ae 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -369,6 +369,15 @@ static void __sco_sock_close(struct sock *sk) case BT_CONNECTED: case BT_CONFIG: + if (sco_pi(sk)->conn) { + sk->sk_state = BT_DISCONN; + sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT); + hci_conn_put(sco_pi(sk)->conn->hcon); + sco_pi(sk)->conn = NULL; + } else + sco_chan_del(sk, ECONNRESET); + break; + case BT_CONNECT: case BT_DISCONN: sco_chan_del(sk, ECONNRESET); |