2 files changed, 9 insertions, 0 deletions

diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index 352f7a2321d9..b16a8dc2afbe 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -154,6 +154,12 @@ static void nci_target_found(struct nci_dev *ndev,
 
         nfc_tgt.sens_res = ntf->rf_tech_specific_params.nfca_poll.sens_res;
         nfc_tgt.sel_res = ntf->rf_tech_specific_params.nfca_poll.sel_res;
+        nfc_tgt.nfcid1_len = ntf->rf_tech_specific_params.nfca_poll.nfcid1_len;
+        if (nfc_tgt.nfcid1_len > 0) {
+                memcpy(nfc_tgt.nfcid1,
+                        ntf->rf_tech_specific_params.nfca_poll.nfcid1,
+                        nfc_tgt.nfcid1_len);
+        }
 
         if (!(nfc_tgt.supported_protocols & ndev->poll_prots)) {
                 pr_debug("the target found does not have the desired protocol\n");
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 43a1c47756a7..6989dfa28ee2 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -67,6 +67,9 @@ static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target,
                                 target->supported_protocols);
         NLA_PUT_U16(msg, NFC_ATTR_TARGET_SENS_RES, target->sens_res);
         NLA_PUT_U8(msg, NFC_ATTR_TARGET_SEL_RES, target->sel_res);
+        if (target->nfcid1_len > 0)
+                NLA_PUT(msg, NFC_ATTR_TARGET_NFCID1, target->nfcid1_len,
+                                target->nfcid1);
 
         return genlmsg_end(msg, hdr);