diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-10-31 09:46:35 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-11-01 18:27:09 -0400 |
commit | f351bc72676e2666543511558215fe3c95d4336f (patch) | |
tree | 129269d69e979d393092ddc69c392c1bef19d150 /net/bluetooth | |
parent | 419e08c1121ab346bf5f66fe0a21950529355cee (diff) |
Bluetooth: AMP: Check for hs_hcon instead of ctrl_id
When deciding whether to send EFS configuration response with success,
check rather for existence of High Speed physical link hs_hcon then
ctrl_id. There might be cases when there is ctrl_id but high speed link
is not established yet.
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index bb2cd9eaa8a1..bdffc4c207b5 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
@@ -3921,7 +3921,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, | |||
3921 | /* check compatibility */ | 3921 | /* check compatibility */ |
3922 | 3922 | ||
3923 | /* Send rsp for BR/EDR channel */ | 3923 | /* Send rsp for BR/EDR channel */ |
3924 | if (!chan->ctrl_id) | 3924 | if (!chan->hs_hcon) |
3925 | l2cap_send_efs_conf_rsp(chan, rsp, cmd->ident, flags); | 3925 | l2cap_send_efs_conf_rsp(chan, rsp, cmd->ident, flags); |
3926 | else | 3926 | else |
3927 | chan->ident = cmd->ident; | 3927 | chan->ident = cmd->ident; |
@@ -3971,7 +3971,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, | |||
3971 | goto done; | 3971 | goto done; |
3972 | } | 3972 | } |
3973 | 3973 | ||
3974 | if (!chan->ctrl_id) { | 3974 | if (!chan->hs_hcon) { |
3975 | l2cap_send_efs_conf_rsp(chan, buf, cmd->ident, | 3975 | l2cap_send_efs_conf_rsp(chan, buf, cmd->ident, |
3976 | 0); | 3976 | 0); |
3977 | } else { | 3977 | } else { |