diff options
author | David S. Miller | 2015-02-08 07:22:25 +0100 |
---|---|---|
committer | David S. Miller | 2015-02-08 07:22:25 +0100 |
commit | 3c09e92fb6b94b7597442c1f232a260c35b30698 (patch) | |
tree | d26115f0e99cb8e5529e0fd37596b0d4592511b2 /include/net/irda/irlmp.h | |
parent | rhashtable: Fix remove logic to avoid cross references between buckets (diff) | |
parent | NFC: nci: Move NFCEE discovery logic (diff) | |
download | kernel-qcow2-linux-3c09e92fb6b94b7597442c1f232a260c35b30698.tar.gz kernel-qcow2-linux-3c09e92fb6b94b7597442c1f232a260c35b30698.tar.xz kernel-qcow2-linux-3c09e92fb6b94b7597442c1f232a260c35b30698.zip |
Merge tag 'nfc-next-3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
NFC: 3.20 second pull request
This is the second NFC pull request for 3.20.
It brings:
- NCI NFCEE (NFC Execution Environment, typically an embedded or
external secure element) discovery and enabling/disabling support.
In order to communicate with an NFCEE, we also added NCI's logical
connections support to the NCI stack.
- HCI over NCI protocol support. Some secure elements only understand
HCI and thus we need to send them HCI frames when they're part of
an NCI chipset.
- NFC_EVT_TRANSACTION userspace API addition. Whenever an application
running on a secure element needs to notify its host counterpart,
we send an NFC_EVENT_SE_TRANSACTION event to userspace through the
NFC netlink socket.
- Secure element and HCI transaction event support for the st21nfcb
chipset.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/irda/irlmp.h')
0 files changed, 0 insertions, 0 deletions