summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-02-03 19:48:06 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2015-02-04 09:13:15 +0100
commit3ba5c8466b320c3fd5d5861b34aa8a31dd0cf6b3 (patch)
treee6d9e4b91a5106c5174e6bde95c19db5f71fde4a
parentb16ae7160a836c4a1e443ea6efca31421e86bae1 (diff)
downloadlinux-3ba5c8466b320c3fd5d5861b34aa8a31dd0cf6b3.tar.gz
linux-3ba5c8466b320c3fd5d5861b34aa8a31dd0cf6b3.tar.bz2
linux-3ba5c8466b320c3fd5d5861b34aa8a31dd0cf6b3.zip
NFC: nci: Change credits field to credits_cnt
For consistency sake change nci_core_conn_create_rsp structure credits field to credits_cnt. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--include/net/nfc/nci.h2
-rw-r--r--net/nfc/nci/rsp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/nfc/nci.h b/include/net/nfc/nci.h
index 695d33cb75e8..a2f2f3d3196d 100644
--- a/include/net/nfc/nci.h
+++ b/include/net/nfc/nci.h
@@ -353,7 +353,7 @@ struct nci_core_set_config_rsp {
struct nci_core_conn_create_rsp {
__u8 status;
__u8 max_ctrl_pkt_payload_len;
- __u8 credits;
+ __u8 credits_cnt;
__u8 conn_id;
} __packed;
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index 05268eb473df..b419fed77ea3 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -245,7 +245,7 @@ static void nci_core_conn_create_rsp_packet(struct nci_dev *ndev,
conn_info->conn_id = rsp->conn_id;
conn_info->max_pkt_payload_len = rsp->max_ctrl_pkt_payload_len;
- atomic_set(&conn_info->credits_cnt, rsp->credits);
+ atomic_set(&conn_info->credits_cnt, rsp->credits_cnt);
}
exit: