redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

NFC: nci: Add reference to the RF logical connection 

The NCI_STATIC_RF_CONN_ID logical connection is the most used
connection. Keeping it directly accessible in the nci_dev
structure will simplify and optimize the access.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
hifive-unleashed-5.1
Christophe Ricard 2015-02-03 19:48:04 +01:00 committed by Samuel Ortiz
parent 26fc6c7f02
commit 12bdf27d46
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/nfc/nci_core.h
View File

@ -189,6 +189,7 @@ struct nci_dev {
__u8 cur_conn_id;
struct list_head conn_info_list;
struct nci_conn_info *rf_conn_info;
struct timer_list cmd_timer;
struct timer_list data_timer;

2
net/nfc/nci/core.c
View File

@ -803,7 +803,7 @@ static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target,
int rc;
struct nci_conn_info *conn_info;
conn_info = nci_get_conn_info_by_conn_id(ndev, NCI_STATIC_RF_CONN_ID);
conn_info = ndev->rf_conn_info;
if (!conn_info)
return -EPROTO;

6
net/nfc/nci/ntf.c
View File

@ -625,8 +625,7 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
exit:
if (err == NCI_STATUS_OK) {
conn_info = nci_get_conn_info_by_conn_id(ndev,
NCI_STATIC_RF_CONN_ID);
conn_info = ndev->rf_conn_info;
if (!conn_info)
return;
@ -684,8 +683,7 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
pr_debug("entry, type 0x%x, reason 0x%x\n", ntf->type, ntf->reason);
conn_info =
nci_get_conn_info_by_conn_id(ndev, NCI_STATIC_RF_CONN_ID);
conn_info = ndev->rf_conn_info;
if (!conn_info)
return;

4
net/nfc/nci/rsp.c
View File

@ -148,8 +148,7 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
if (status == NCI_STATUS_OK) {
atomic_set(&ndev->state, NCI_DISCOVERY);
conn_info = nci_get_conn_info_by_conn_id(ndev,
NCI_STATIC_RF_CONN_ID);
conn_info = ndev->rf_conn_info;
if (!conn_info) {
conn_info = devm_kzalloc(&ndev->nfc_dev->dev,
sizeof(struct nci_conn_info),
@ -161,6 +160,7 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
conn_info->conn_id = NCI_STATIC_RF_CONN_ID;
INIT_LIST_HEAD(&conn_info->list);
list_add(&conn_info->list, &ndev->conn_info_list);
ndev->rf_conn_info = conn_info;
}
}