Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[firefly-linux-kernel-4.4.55.git] / net / nfc / netlink.c

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index ebbf6fb88b3596708597331ae630be2a7dcade6d..43cb1c17e267d0f614029bad9d3eebcf7b6f5e4c 100644 (file)
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -94,6 +94,14 @@ static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target,
                    target->sensf_res))
                goto nla_put_failure;
 
+       if (target->is_iso15693) {
+               if (nla_put_u8(msg, NFC_ATTR_TARGET_ISO15693_DSFID,
+                              target->iso15693_dsfid) ||
+                   nla_put(msg, NFC_ATTR_TARGET_ISO15693_UID,
+                           sizeof(target->iso15693_uid), target->iso15693_uid))
+                       goto nla_put_failure;
+       }
+
        return genlmsg_end(msg, hdr);
 
 nla_put_failure: