Bluetooth: Define PHY flags in hdev and set 1M as default

1M is mandatory to be supported by LE controllers and the same
would be set in power on. This patch defines hdev flags for
LE PHYs and set 1M to default.

Signed-off-by: Jaganath Kanakkassery <jaganathx.kanakkassery@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index f5c21004186c..432f89f390c0 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -830,10 +830,9 @@ static int hci_init4_req(struct hci_request *req, unsigned long opt)
         if (hdev->commands[35] & 0x20) {
                 struct hci_cp_le_set_default_phy cp;
 
-                /* No transmitter PHY or receiver PHY preferences */
-                cp.all_phys = 0x03;
-                cp.tx_phys = 0;
-                cp.rx_phys = 0;
+                cp.all_phys = 0x00;
+                cp.tx_phys = hdev->le_tx_def_phys;
+                cp.rx_phys = hdev->le_rx_def_phys;
 
                 hci_req_add(req, HCI_OP_LE_SET_DEFAULT_PHY, sizeof(cp), &cp);
         }
@@ -3027,6 +3026,8 @@ struct hci_dev *hci_alloc_dev(void)
         hdev->le_max_tx_time = 0x0148;
         hdev->le_max_rx_len = 0x001b;
         hdev->le_max_rx_time = 0x0148;
+        hdev->le_tx_def_phys = HCI_LE_SET_PHY_1M;
+        hdev->le_rx_def_phys = HCI_LE_SET_PHY_1M;
 
         hdev->rpa_timeout = HCI_DEFAULT_RPA_TIMEOUT;
         hdev->discov_interleaved_timeout = DISCOV_INTERLEAVED_TIMEOUT;