diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-03-17 18:16:50 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-17 18:16:50 +0100 |
commit | 20d83f2464c0d1e27b24d654aa5495dcc44759c0 (patch) | |
tree | a6c36d9e48920f6d81b7dac9ad6b1f99dfdaf592 /net/nfc/netlink.c | |
parent | ath9k_htc: move DEFAULT_SWBA_RESPONSE check to ath9k_htc_beacon_init (diff) | |
parent | NFC: llcp: Use list_for_each_entry in nfc_llcp_find_local() (diff) | |
download | linux-20d83f2464c0d1e27b24d654aa5495dcc44759c0.tar.xz linux-20d83f2464c0d1e27b24d654aa5495dcc44759c0.zip |
Merge tag 'nfc-next-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says:
"NFC: 3.15: First pull request
This is the NFC pull request for 3.15. With this one we have:
- Support for ISO 15693 a.k.a. NFC vicinity a.k.a. Type 5 tags. ISO
15693 are long range (1 - 2 meters) vicinity tags/cards. The kernel
now supports those through the NFC netlink and digital APIs.
- Support for TI's trf7970a chipset. This chipset relies on the NFC
digital layer and the driver currently supports type 2, 4A and 5 tags.
- Support for NXP's pn544 secure firmare download. The pn544 C3 chipsets
relies on a different firmware download protocal than the C2 one. We
now support both and use the right one depending on the version we
detect at runtime.
- Support for 4A tags from the NFC digital layer.
- A bunch of cleanups and minor fixes from Axel Lin and Thierry Escande."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc/netlink.c')
-rw-r--r-- | net/nfc/netlink.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index ebbf6fb88b35..43cb1c17e267 100644 --- 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: |