diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-05-14 22:46:01 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-12-05 07:05:33 -0800 |
| commit | cea04ce35eb3e2e53e7c7bb8ebe9c10312f79b84 (patch) | |
| tree | ba525be0868bb825e829524d219dcdf4027a1a60 /net/bluetooth | |
| parent | 27e2d4c8d28be1d1b4ecfbffab572d7dbd35254d (diff) | |
| download | blackbird-op-linux-cea04ce35eb3e2e53e7c7bb8ebe9c10312f79b84.tar.gz blackbird-op-linux-cea04ce35eb3e2e53e7c7bb8ebe9c10312f79b84.zip | |
Bluetooth: Fix L2CAP channel closing for LE connections
Sending of the L2CAP Disconnect request should also be performed for LE
based channels. The proper thing to do is therefore to look at whether
there's a PSM specified for the channel instead of looking at the link
type.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index d6f518d7e61b..744afae61931 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -674,8 +674,10 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason) case BT_CONNECTED: case BT_CONFIG: - if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED && - conn->hcon->type == ACL_LINK) { + /* ATT uses L2CAP_CHAN_CONN_ORIENTED so we must also + * check for chan->psm. + */ + if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED && chan->psm) { __set_chan_timer(chan, chan->ops->get_sndtimeo(chan)); l2cap_send_disconn_req(chan, reason); } else |
