diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-08-14 12:34:26 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-12-03 16:51:20 +0100 |
| commit | b5ae344d4c0f69ae6526565b55d52b64bc127087 (patch) | |
| tree | 51f92c80d175beac8b4ce5880a901b19fa5b2d15 /net/bluetooth/l2cap_core.c | |
| parent | ef8efe4bf8b5fe1a9342ae964c428aed1be7863b (diff) | |
| download | linux-stable-b5ae344d4c0f69ae6526565b55d52b64bc127087.tar.gz linux-stable-b5ae344d4c0f69ae6526565b55d52b64bc127087.tar.bz2 linux-stable-b5ae344d4c0f69ae6526565b55d52b64bc127087.zip | |
Bluetooth: Add full SMP BR/EDR support
When doing SMP over BR/EDR some of the routines can be shared with the
LE functionality whereas others needs to be split into their own BR/EDR
specific branches. This patch implements the split of BR/EDR specific
SMP code from the LE-only code, making sure SMP over BR/EDR works as
specified.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 43349ed4c249..a8da7ea9c2c0 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6967,6 +6967,10 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon) test_bit(HCI_HS_ENABLED, &hcon->hdev->dev_flags)) conn->local_fixed_chan |= L2CAP_FC_A2MP; + if (bredr_sc_enabled(hcon->hdev) && + test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags)) + conn->local_fixed_chan |= L2CAP_FC_SMP_BREDR; + mutex_init(&conn->ident_lock); mutex_init(&conn->chan_lock); |