diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-18 15:17:11 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-18 15:17:11 -0400 |
| commit | 8fa48cbdfb0b7c2e39a8f2a46f987afe9b9c0579 (patch) | |
| tree | 187728296c1ee053106ed26cb09e13c331faad64 /net | |
| parent | 9437a248e7cac427c898bdb11bd1ac6844a1ead4 (diff) | |
| parent | ebaf5795ef57a70a042ea259448a465024e2821d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/sco.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 79d87d8d4f51..fad0302bdb32 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -359,6 +359,7 @@ static void __sco_sock_close(struct sock *sk) sco_chan_del(sk, ECONNRESET); break; + case BT_CONNECT2: case BT_CONNECT: case BT_DISCONN: sco_chan_del(sk, ECONNRESET); |