1 files changed, 19 insertions, 1 deletions

diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index 041de51ccdbe..93b914937263 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -140,13 +140,31 @@ static void nci_rf_disc_map_rsp_packet(struct nci_dev *ndev,
 
 static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
 {
+        struct nci_conn_info    *conn_info;
         __u8 status = skb->data[0];
 
         pr_debug("status 0x%x\n", status);
 
-        if (status == NCI_STATUS_OK)
+        if (status == NCI_STATUS_OK) {
                 atomic_set(&ndev->state, NCI_DISCOVERY);
 
+                conn_info = nci_get_conn_info_by_conn_id(ndev,
+                                                         NCI_STATIC_RF_CONN_ID);
+                if (!conn_info) {
+                        conn_info = devm_kzalloc(&ndev->nfc_dev->dev,
+                                                 sizeof(struct nci_conn_info),
+                                                 GFP_KERNEL);
+                        if (!conn_info) {
+                                status = NCI_STATUS_REJECTED;
+                                goto exit;
+                        }
+                        conn_info->conn_id = NCI_STATIC_RF_CONN_ID;
+                        INIT_LIST_HEAD(&conn_info->list);
+                        list_add(&conn_info->list, &ndev->conn_info_list);
+                }
+        }
+
+exit:
         nci_req_complete(ndev, status);
 }