diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-11-29 17:46:05 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-12-03 16:00:00 -0200 |
| commit | 5d05416e0907b0dd30b62b002bed3b85e6efbd61 (patch) | |
| tree | 8ee7c46ae2533c168a63e9e1ea10980168c06a2c /net/bluetooth | |
| parent | ced5c338d7b696021058c23fb6a286def2171df5 (diff) | |
| download | linux-stable-5d05416e0907b0dd30b62b002bed3b85e6efbd61.tar.gz linux-stable-5d05416e0907b0dd30b62b002bed3b85e6efbd61.tar.bz2 linux-stable-5d05416e0907b0dd30b62b002bed3b85e6efbd61.zip | |
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/bluetooth')
| -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) struct l2cap_conn *conn = chan->conn; if (enable_hs && + hci_amp_capable() && chan->chan_policy == BT_CHANNEL_POLICY_AMP_PREFERRED && conn->fixed_chan_mask & L2CAP_FC_A2MP) return true; |