diff options
| author | John W. Linville | 2013-03-29 21:41:36 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-03-29 21:41:36 +0100 |
| commit | 9a574cd67a447059f9c14bbef47873315d7f7b35 (patch) | |
| tree | 0ebb71d213d868d8884b1fa0e05b7393c66c665b /net/bluetooth/sco.c | |
| parent | brcmsmac: remove some pmu functions and use the bcma equivalents (diff) | |
| parent | b43: N-PHY: use more bits for offset in RSSI calibration (diff) | |
| download | kernel-qcow2-linux-9a574cd67a447059f9c14bbef47873315d7f7b35.tar.gz kernel-qcow2-linux-9a574cd67a447059f9c14bbef47873315d7f7b35.tar.xz kernel-qcow2-linux-9a574cd67a447059f9c14bbef47873315d7f7b35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h
Diffstat (limited to 'net/bluetooth/sco.c')
| -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 0a3aeb7e0aa6..d919d1161ab4 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); |