summaryrefslogtreecommitdiffstats
path: root/include/net/nfc
diff options
context:
space:
mode:
authorEric Lapuyade <eric.lapuyade@intel.com>2012-04-10 19:43:11 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-04-12 21:10:38 +0200
commit144612cacc0b5c230f0b3aebc3a3a53854c332ee (patch)
treeec2b6fa0faf19ca9977c50a84ba9ba21aabe725a /include/net/nfc
parentNFC: Fix next target_idx type and rename for clarity (diff)
downloadlinux-144612cacc0b5c230f0b3aebc3a3a53854c332ee.tar.xz
linux-144612cacc0b5c230f0b3aebc3a3a53854c332ee.zip
NFC: Changed target activated state logic
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/nfc')
-rw-r--r--include/net/nfc/nfc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index f4f6950a8b05..7273ff169bb8 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -66,6 +66,7 @@ struct nfc_ops {
#define NFC_TARGET_IDX_ANY -1
#define NFC_MAX_GT_LEN 48
+#define NFC_TARGET_IDX_NONE 0xffffffff
struct nfc_target {
u32 idx;
@@ -97,7 +98,7 @@ struct nfc_dev {
struct device dev;
bool dev_up;
bool polling;
- bool remote_activated;
+ u32 activated_target_idx;
bool dep_link_up;
u32 dep_rf_mode;
struct nfc_genl_data genl_data;