diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-12-04 19:27:40 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-12-04 19:27:40 +0300 |
| commit | 04bb7ecf8854186f47fb1ea321fc77e7bc931993 (patch) | |
| tree | d868ed692edebb2b2a31ecb16c5ab057fb3b008d /include/net/nfc/nfc.h | |
| parent | ea375117013dcca43ea4ffeb920735ab71c75ef3 (diff) | |
| parent | e479ce479743984a5d4581749f9aaa9c3bfd65e4 (diff) | |
| download | linux-04bb7ecf8854186f47fb1ea321fc77e7bc931993.tar.xz | |
Merge tag 'nfc-next-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says:
"NFC: 3.19 pull request
This is the NFC pull request for 3.19.
With this one we get:
- NFC digital improvements for DEP support: Chaining, NACK and ATN
support added.
- NCI improvements: Support for p2p target, SE IO operand addition,
SE operands extensions to support proprietary implementations, and
a few fixes.
- NFC HCI improvements: OPEN_PIPE and NOTIFY_ALL_CLEARED support,
and SE IO operand addition.
- A bunch of minor improvements and fixes for STMicro st21nfcb and
st21nfca"
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/nfc/nfc.h')
| -rw-r--r-- | include/net/nfc/nfc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h index 6c583e244de2..12adb817c27a 100644 --- a/include/net/nfc/nfc.h +++ b/include/net/nfc/nfc.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Instituto Nokia de Tecnologia + * Copyright (C) 2014 Marvell International Ltd. * * Authors: * Lauro Ramos Venancio <lauro.venancio@openbossa.org> @@ -87,6 +88,7 @@ struct nfc_ops { #define NFC_TARGET_IDX_ANY -1 #define NFC_MAX_GT_LEN 48 #define NFC_ATR_RES_GT_OFFSET 15 +#define NFC_ATR_REQ_GT_OFFSET 14 /** * struct nfc_target - NFC target descriptiom |