diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-07 15:02:28 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-07 15:18:08 +0200 |
| commit | cdd6275e510bd86c44d3fc85a78306f514bbac9a (patch) | |
| tree | c9f4c491100cef5c0a68e79545b3132073e4fd3a /net/bluetooth/hci_event.c | |
| parent | d93375a82da10cb023afc945fa18471bf3c41704 (diff) | |
| download | op-kernel-dev-cdd6275e510bd86c44d3fc85a78306f514bbac9a.zip op-kernel-dev-cdd6275e510bd86c44d3fc85a78306f514bbac9a.tar.gz | |
Bluetooth: Pass desired connection role to hci_connect_le()
If we have both LE scanning and advertising simultaneously enabled we
need a way to tell hci_connect_le() in which role to initiate a
connection. This patch adds a new parameter to the function to give it
the necessary information. For auto-connect and mgmt_pair_device we
always use master role, whereas for L2CAP users (in practice sockets) we
use slave role whenever HCI_ADVERTISING is set and master role
otherwise.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index ad39d9a..a681649 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -4253,8 +4253,9 @@ static void check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr, return; connect: + /* Request connection in master = true role */ conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW, - HCI_LE_AUTOCONN_TIMEOUT); + HCI_LE_AUTOCONN_TIMEOUT, true); if (!IS_ERR(conn)) return; |
