summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2014-05-25 22:35:40 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2014-07-23 00:49:36 +0200
commitbb15b2170c80b96ea78c0f8c8a6e0ed75fa91c10 (patch)
tree7a73a7574b49f7b323741010e44edf2b7c0b2db7 /net/nfc
parent955164ebb8f8d337ca5b8540ae1f9d4def7f0ad0 (diff)
downloadop-kernel-dev-bb15b2170c80b96ea78c0f8c8a6e0ed75fa91c10.zip
op-kernel-dev-bb15b2170c80b96ea78c0f8c8a6e0ed75fa91c10.tar.gz
NFC: nci: Add T1T support notification
Add T1T matching with Jewel during notification. It was causing "the target found does not have the desired protocol" to show up. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/nci/ntf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index f8f6af2..df91bb9 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -166,7 +166,9 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
struct rf_tech_specific_params_nfcf_poll *nfcf_poll;
__u32 protocol;
- if (rf_protocol == NCI_RF_PROTOCOL_T2T)
+ if (rf_protocol == NCI_RF_PROTOCOL_T1T)
+ protocol = NFC_PROTO_JEWEL_MASK;
+ else if (rf_protocol == NCI_RF_PROTOCOL_T2T)
protocol = NFC_PROTO_MIFARE_MASK;
else if (rf_protocol == NCI_RF_PROTOCOL_ISO_DEP)
if (rf_tech_and_mode == NCI_NFC_A_PASSIVE_POLL_MODE)
OpenPOWER on IntegriCloud