summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-10-31 15:46:27 +0200
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-11-01 20:27:05 -0200
commit336178a33491685039d154d1f0a8bd696f51699b (patch)
treef45eb5b089c1f065662790eff7ca7c15b74ec451 /net/bluetooth
parentba6fc31727c07e11a7b700a9c17e91ab4bed2f4c (diff)
downloadlinux-stable-336178a33491685039d154d1f0a8bd696f51699b.tar.gz
linux-stable-336178a33491685039d154d1f0a8bd696f51699b.tar.bz2
linux-stable-336178a33491685039d154d1f0a8bd696f51699b.zip
Bluetooth: Save hs_hchan instead of hs_hcon in loglink complete
When logical link creation is completed we need to save hs_hchan which represents logical link instead of hs_hcon representing physical link. hs_hcon shall be saved when receiving physical link complete event. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index c2fbaf9c6ac8..4ef85d24797d 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4375,7 +4375,7 @@ static void l2cap_logical_finish_create(struct l2cap_chan *chan,
{
struct l2cap_conf_rsp rsp;
- chan->hs_hcon = hchan->conn;
+ chan->hs_hchan = hchan;
chan->hs_hcon->l2cap_data = chan->conn;
l2cap_send_efs_conf_rsp(chan, &rsp, chan->ident, 0);