aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville2013-03-20 14:26:37 -0400
committerJohn W. Linville2013-03-20 14:26:37 -0400
commitb9d5319041999401d29e7efcd5d15664edfaad2e (patch)
tree2d2097b3115d758834c08fc13a4a513b76d9701d /net
parentda2191e31409d1058dcbed44e8f53e39a40e86b3 (diff)
parent36ef0b473fbf43d5db23eea4616cc1d18cec245f (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/sco.c1
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);