nfc: nci: Add an additional parameter to identify a connection id

According to NCI specification, destination type and destination
specific parameters shall uniquely identify a single destination
for the Logical Connection.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

2 files changed, 6 insertions, 3 deletions

diff --git a/drivers/nfc/fdp/fdp.c b/drivers/nfc/fdp/fdp.c
index ccb07a1b153d..e44a7a2f4061 100644
--- a/drivers/nfc/fdp/fdp.c
+++ b/drivers/nfc/fdp/fdp.c
@@ -102,7 +102,8 @@ static int fdp_nci_create_conn(struct nci_dev *ndev)
         if (r)
                 return r;
 
-        return nci_get_conn_info_by_id(ndev, 0);
+        return nci_get_conn_info_by_dest_type_params(ndev,
+                                                     FDP_PATCH_CONN_DEST, NULL);
 }
 
 static inline int fdp_nci_get_versions(struct nci_dev *ndev)
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index e7f25f4e3dc3..420f019cc42f 100644
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -600,10 +600,12 @@ static int st_nci_hci_network_init(struct nci_dev *ndev)
          * HCI will be used here only for proprietary commands.
          */
         if (test_bit(ST_NCI_FACTORY_MODE, &info->flags))
-                r = nci_nfcee_mode_set(ndev, ndev->hci_dev->conn_info->id,
+                r = nci_nfcee_mode_set(ndev,
+                                       ndev->hci_dev->conn_info->dest_params->id,
                                        NCI_NFCEE_DISABLE);
         else
-                r = nci_nfcee_mode_set(ndev, ndev->hci_dev->conn_info->id,
+                r = nci_nfcee_mode_set(ndev,
+                                       ndev->hci_dev->conn_info->dest_params->id,
                                        NCI_NFCEE_ENABLE);
 
 free_dest_params: