projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
[linux-block.git]
/
net
/
bluetooth
/
hci_sync.c
diff --git
a/net/bluetooth/hci_sync.c
b/net/bluetooth/hci_sync.c
index c5d8799046ccffbf798e6f47ffaef3dddcb364ca..4c707eb64e6f63d8e2ea85a7ac12a31060dcf7e4 100644
(file)
--- a/
net/bluetooth/hci_sync.c
+++ b/
net/bluetooth/hci_sync.c
@@
-6346,7
+6346,8
@@
static int hci_le_ext_create_conn_sync(struct hci_dev *hdev,
plen = sizeof(*cp);
plen = sizeof(*cp);
- if (scan_1m(hdev)) {
+ if (scan_1m(hdev) && (conn->le_adv_phy == HCI_ADV_PHY_1M ||
+ conn->le_adv_sec_phy == HCI_ADV_PHY_1M)) {
cp->phys |= LE_SCAN_PHY_1M;
set_ext_conn_params(conn, p);
cp->phys |= LE_SCAN_PHY_1M;
set_ext_conn_params(conn, p);
@@
-6354,7
+6355,8
@@
static int hci_le_ext_create_conn_sync(struct hci_dev *hdev,
plen += sizeof(*p);
}
plen += sizeof(*p);
}
- if (scan_2m(hdev)) {
+ if (scan_2m(hdev) && (conn->le_adv_phy == HCI_ADV_PHY_2M ||
+ conn->le_adv_sec_phy == HCI_ADV_PHY_2M)) {
cp->phys |= LE_SCAN_PHY_2M;
set_ext_conn_params(conn, p);
cp->phys |= LE_SCAN_PHY_2M;
set_ext_conn_params(conn, p);
@@
-6362,7
+6364,8
@@
static int hci_le_ext_create_conn_sync(struct hci_dev *hdev,
plen += sizeof(*p);
}
plen += sizeof(*p);
}
- if (scan_coded(hdev)) {
+ if (scan_coded(hdev) && (conn->le_adv_phy == HCI_ADV_PHY_CODED ||
+ conn->le_adv_sec_phy == HCI_ADV_PHY_CODED)) {
cp->phys |= LE_SCAN_PHY_CODED;
set_ext_conn_params(conn, p);
cp->phys |= LE_SCAN_PHY_CODED;
set_ext_conn_params(conn, p);