diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-31 00:02:26 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-06-04 21:34:30 +0200 |
| commit | f212ad5e993e7efb996fc8ce94a5de8f0bd06d41 (patch) | |
| tree | 719e09118ffc8e80a7c916d16c0529510bdc5ebb /include | |
| parent | fc40a8c1a06ab7db45da790693dd9802612a055c (diff) | |
| download | linux-f212ad5e993e7efb996fc8ce94a5de8f0bd06d41.tar.bz2 | |
NFC: Set the NFC device RF mode appropriately
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfc.h | 1 | ||||
| -rw-r--r-- | include/net/nfc/nfc.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/nfc.h b/include/linux/nfc.h index d124e9273fcb..f4e6dd915b1c 100644 --- a/include/linux/nfc.h +++ b/include/linux/nfc.h @@ -146,6 +146,7 @@ enum nfc_attrs { /* NFC RF modes */ #define NFC_RF_INITIATOR 0 #define NFC_RF_TARGET 1 +#define NFC_RF_NONE 2 /* NFC protocols masks used in bitsets */ #define NFC_PROTO_JEWEL_MASK (1 << NFC_PROTO_JEWEL) diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h index 41573b4bd78a..a6a7b49a3e2d 100644 --- a/include/net/nfc/nfc.h +++ b/include/net/nfc/nfc.h @@ -100,10 +100,10 @@ struct nfc_dev { int targets_generation; struct device dev; bool dev_up; + u8 rf_mode; bool polling; struct nfc_target *active_target; bool dep_link_up; - u32 dep_rf_mode; struct nfc_genl_data genl_data; u32 supported_protocols; |