diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-11-29 10:46:05 -0500 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-12-03 13:00:00 -0500 |
commit | 5d05416e0907b0dd30b62b002bed3b85e6efbd61 (patch) | |
tree | 8ee7c46ae2533c168a63e9e1ea10980168c06a2c /net | |
parent | ced5c338d7b696021058c23fb6a286def2171df5 (diff) |
Bluetooth: AMP: Check that AMP is present and active
Before starting quering remote AMP controllers make sure
that there is local active AMP controller.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/l2cap_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index f7ee037c7934..d8cffdbf0d37 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
@@ -1013,6 +1013,7 @@ static bool __amp_capable(struct l2cap_chan *chan) | |||
1013 | struct l2cap_conn *conn = chan->conn; | 1013 | struct l2cap_conn *conn = chan->conn; |
1014 | 1014 | ||
1015 | if (enable_hs && | 1015 | if (enable_hs && |
1016 | hci_amp_capable() && | ||
1016 | chan->chan_policy == BT_CHANNEL_POLICY_AMP_PREFERRED && | 1017 | chan->chan_policy == BT_CHANNEL_POLICY_AMP_PREFERRED && |
1017 | conn->fixed_chan_mask & L2CAP_FC_A2MP) | 1018 | conn->fixed_chan_mask & L2CAP_FC_A2MP) |
1018 | return true; | 1019 | return true; |