summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIlan Elias <ilane@ti.com>2012-01-17 14:03:50 +0400
committerJohn W. Linville <linville@tuxdriver.com>2012-01-24 23:21:55 +0400
commitc4bf98b220cba7a8618405261d69ee53a265110e (patch)
tree2710efffaefc519f0d08f116ba669b1648aaab4a /include
parent889cbb911a195b832745f77240f547cb2a2885bc (diff)
downloadlinux-c4bf98b220cba7a8618405261d69ee53a265110e.tar.xz
NFC: Add NCI data exchange timer
Add NCI data exchange timer to catch timeouts, and call the data exchange callback with an error. Signed-off-by: Ilan Elias <ilane@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/nfc/nci_core.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index f4963ea77947..9154663b606b 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -41,6 +41,7 @@ enum {
NCI_DISCOVERY,
NCI_POLL_ACTIVE,
NCI_DATA_EXCHANGE,
+ NCI_DATA_EXCHANGE_TO,
};
/* NCI timeouts */
@@ -49,6 +50,7 @@ enum {
#define NCI_RF_DISC_TIMEOUT 5000
#define NCI_RF_DEACTIVATE_TIMEOUT 30000
#define NCI_CMD_TIMEOUT 5000
+#define NCI_DATA_TIMEOUT 700
struct nci_dev;
@@ -74,6 +76,7 @@ struct nci_dev {
atomic_t credits_cnt;
struct timer_list cmd_timer;
+ struct timer_list data_timer;
struct workqueue_struct *cmd_wq;
struct work_struct cmd_work;