diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-12-19 19:11:32 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-01-10 00:51:54 +0100 |
| commit | 390a1bd8538132186ddb679cafe9e75b7ef7e2d2 (patch) | |
| tree | 1c548396163a30e0e29f6572cf7b6f0c645085ba /net/nfc/hci | |
| parent | 2ad554a502facd705ce6eb362d0f1ac3ca426508 (diff) | |
| download | blackbird-op-linux-390a1bd8538132186ddb679cafe9e75b7ef7e2d2.tar.gz blackbird-op-linux-390a1bd8538132186ddb679cafe9e75b7ef7e2d2.zip | |
NFC: Initial Secure Element API
Each NFC adapter can have several links to different secure elements and
that property needs to be exported by the drivers.
A secure element link can be enabled and disabled, and card emulation will
be handled by the currently active one. Otherwise card emulation will be
host implemented.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/hci')
| -rw-r--r-- | net/nfc/hci/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c index 755a6b9774ab..91020b210d87 100644 --- a/net/nfc/hci/core.c +++ b/net/nfc/hci/core.c @@ -797,6 +797,7 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops, struct nfc_hci_init_data *init_data, unsigned long quirks, u32 protocols, + u32 supported_se, const char *llc_name, int tx_headroom, int tx_tailroom, @@ -822,7 +823,7 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops, return NULL; } - hdev->ndev = nfc_allocate_device(&hci_nfc_ops, protocols, + hdev->ndev = nfc_allocate_device(&hci_nfc_ops, protocols, supported_se, tx_headroom + HCI_CMDS_HEADROOM, tx_tailroom); if (!hdev->ndev) { |
