Bluetooth: hci_conn: Fix updating ISO QoS PHY

BT_ISO_QOS has different semantics when it comes to QoS PHY as it uses
0x00 to disable a direction but that value is invalid over HCI and
sockets using DEFER_SETUP to connect may attempt to use hci_bind_cis
multiple times in order to detect if the parameters have changed, so to
fix the code will now just mirror the PHY for the parameters of
HCI_OP_LE_SET_CIG_PARAMS and will not update the PHY of the socket
leaving it disabled.

Fixes: 1cbf406bf6533 ("Bluetooth: Add initial implementation of CIS connections")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index f54864e19866d9688ea41f410df1eb246ec318c8..9777e7b109eee47dfeab79b3dbfa0b91703e8d77 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1551,8 +1551,8 @@ static void cis_add(struct iso_list_data *d, struct bt_iso_qos *qos)
        cis->cis_id = qos->cis;
        cis->c_sdu  = cpu_to_le16(qos->out.sdu);
        cis->p_sdu  = cpu_to_le16(qos->in.sdu);
-       cis->c_phy  = qos->out.phy;
-       cis->p_phy  = qos->in.phy;
+       cis->c_phy  = qos->out.phy ? qos->out.phy : qos->in.phy;
+       cis->p_phy  = qos->in.phy ? qos->in.phy : qos->out.phy;
        cis->c_rtn  = qos->out.rtn;
        cis->p_rtn  = qos->in.rtn;
 
@@ -1735,13 +1735,6 @@ struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst,
        if (!qos->in.latency)
                qos->in.latency = qos->out.latency;
 
-       /* Mirror PHYs that are disabled as SDU will be set to 0 */
-       if (!qos->in.phy)
-               qos->in.phy = qos->out.phy;
-
-       if (!qos->out.phy)
-               qos->out.phy = qos->in.phy;
-
        if (!hci_le_set_cig_params(cis, qos)) {
                hci_conn_drop(cis);
                return ERR_PTR(-EINVAL);