diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-02-03 19:48:07 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-02-04 09:14:09 +0100 |
| commit | 15d4a8da0e440faf589a26346c8287e1ed0abe6c (patch) | |
| tree | d6ddf14215118c72dff898f57b24535e68225878 /include/net/nfc | |
| parent | 3ba5c8466b320c3fd5d5861b34aa8a31dd0cf6b3 (diff) | |
| download | linux-15d4a8da0e440faf589a26346c8287e1ed0abe6c.tar.gz linux-15d4a8da0e440faf589a26346c8287e1ed0abe6c.tar.xz | |
NFC: nci: Move logical connection structure allocation
conn_info is currently allocated only after nfcee_discovery_ntf
which is not generic enough for logical connection other than
NFCEE. The corresponding conn_info is now created in
nci_core_conn_create_rsp().
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/net/nfc')
| -rw-r--r-- | include/net/nfc/nci_core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h index d34c1b2295d7..ff87f8611fa3 100644 --- a/include/net/nfc/nci_core.h +++ b/include/net/nfc/nci_core.h @@ -159,6 +159,7 @@ struct nci_hci_init_data { #define NCI_HCI_MAX_GATES 256 struct nci_hci_dev { + u8 nfcee_id; struct nci_dev *ndev; struct nci_conn_info *conn_info; |