diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2016-04-30 09:12:51 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2016-05-04 01:43:21 +0200 |
| commit | 9b8d1a4cf2aa819d606b4e423a6523fc0d4460a2 (patch) | |
| tree | 5862df9d18bb3e54f90b6fb81a23ac68ea0107a8 /include/net | |
| parent | nfc: nci: Fix nci_core_conn_close (diff) | |
| download | linux-9b8d1a4cf2aa819d606b4e423a6523fc0d4460a2.tar.xz linux-9b8d1a4cf2aa819d606b4e423a6523fc0d4460a2.zip | |
nfc: nci: Add an additional parameter to identify a connection id
According to NCI specification, destination type and destination
specific parameters shall uniquely identify a single destination
for the Logical Connection.
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/nfc/nci_core.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h index 57ce24fb0047..ebb50d286ef6 100644 --- a/include/net/nfc/nci_core.h +++ b/include/net/nfc/nci_core.h @@ -109,7 +109,13 @@ struct nci_ops { struct nci_conn_info { struct list_head list; - __u8 id; /* can be an RF Discovery ID or an NFCEE ID */ + /* NCI specification 4.4.2 Connection Creation + * The combination of destination type and destination specific + * parameters shall uniquely identify a single destination for the + * Logical Connection + */ + struct dest_spec_params *dest_params; + __u8 dest_type; __u8 conn_id; __u8 max_pkt_payload_len; @@ -260,7 +266,9 @@ struct nci_dev { __u32 manufact_specific_info; /* Save RF Discovery ID or NFCEE ID under conn_create */ - __u8 cur_id; + struct dest_spec_params cur_params; + /* Save destination type under conn_create */ + __u8 cur_dest_type; /* stored during nci_data_exchange */ struct sk_buff *rx_data_reassembly; @@ -378,7 +386,8 @@ void nci_clear_target_list(struct nci_dev *ndev); void nci_req_complete(struct nci_dev *ndev, int result); struct nci_conn_info *nci_get_conn_info_by_conn_id(struct nci_dev *ndev, int conn_id); -int nci_get_conn_info_by_id(struct nci_dev *ndev, u8 id); +int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type, + struct dest_spec_params *params); /* ----- NCI status code ----- */ int nci_to_errno(__u8 code); |