diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-10-15 04:58:42 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-10-15 08:47:44 -0400 |
commit | 79de886d9c40be1d82d414ccc5640268c705af39 (patch) | |
tree | 9499571ea0399f66ad06c4793bc94b06ded1ee52 | |
parent | 1d13a254e14565e6a2d91f7552203406a30d1ee2 (diff) |
Bluetooth: Send EFS Conf Rsp only for BR/EDR chan
Do not send EFS Configuration Response for High Speed channel yet.
It will be sent after receiving Logical 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>
-rw-r--r-- | net/bluetooth/l2cap_core.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 99176730bf2c..603742fc17a7 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
@@ -3709,7 +3709,11 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, | |||
3709 | 3709 | ||
3710 | /* check compatibility */ | 3710 | /* check compatibility */ |
3711 | 3711 | ||
3712 | l2cap_send_efs_conf_rsp(chan, rsp, cmd->ident, flags); | 3712 | /* Send rsp for BR/EDR channel */ |
3713 | if (!chan->ctrl_id) | ||
3714 | l2cap_send_efs_conf_rsp(chan, rsp, cmd->ident, flags); | ||
3715 | else | ||
3716 | chan->ident = cmd->ident; | ||
3713 | } | 3717 | } |
3714 | 3718 | ||
3715 | unlock: | 3719 | unlock: |
@@ -3758,7 +3762,11 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, | |||
3758 | 3762 | ||
3759 | /* check compatibility */ | 3763 | /* check compatibility */ |
3760 | 3764 | ||
3761 | l2cap_send_efs_conf_rsp(chan, buf, cmd->ident, 0); | 3765 | if (!chan->ctrl_id) |
3766 | l2cap_send_efs_conf_rsp(chan, buf, cmd->ident, | ||
3767 | 0); | ||
3768 | else | ||
3769 | chan->ident = cmd->ident; | ||
3762 | } | 3770 | } |
3763 | goto done; | 3771 | goto done; |
3764 | 3772 | ||