Skip to content

L
linux
Commit 373a1f2b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Options

Merge branch 'nfc-constify-pointed-data-missed-part' 

Krzysztof Kozlowski says:

====================
nfc: constify pointed data - missed part

This was previously sent [1] but got lost. It was a prerequisite to part two of NFC const [2].

Changes since v2:
1. Drop patch previously 7/8 which cases new warnings "warning: Using
   plain integer as NULL pointer".

Changes since v1:
1. Add patch 1/8 fixing up nfcmrvl_spi_parse_dt()

[1] https://lore.kernel.org/lkml/20210726145224.146006-1-krzysztof.kozlowski@canonical.com/
[2] https://lore.kernel.org/linux-nfc/20210729104022.47761-1-krzysztof.kozlowski@canonical.com/T/#m199fbdde180fa005a10addf28479fcbdc6263eab
====================

Link: https://lore.kernel.org/r/20210730144202.255890-1-krzysztof.kozlowski@canonical.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 79976892 77411df5
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 183 deletions
drivers/nfc/nfcmrvl/spi.c
View file @ 373a1f2b
...@@ -106,7 +106,7 @@ static const struct nfcmrvl_if_ops spi_ops = { ...@@ -106,7 +106,7 @@ static const struct nfcmrvl_if_ops spi_ops = {
.nci_update_config = nfcmrvl_spi_nci_update_config, .nci_update_config = nfcmrvl_spi_nci_update_config,
}; };
static int nfcmrvl_spi_parse_dt(const struct device_node *node, static int nfcmrvl_spi_parse_dt(struct device_node *node,
struct nfcmrvl_platform_data *pdata) struct nfcmrvl_platform_data *pdata)
{ {
int ret; int ret;
......
drivers/nfc/pn544/pn544.c
View file @ 373a1f2b
...@@ -809,7 +809,7 @@ static int pn544_hci_discover_se(struct nfc_hci_dev *hdev) ...@@ -809,7 +809,7 @@ static int pn544_hci_discover_se(struct nfc_hci_dev *hdev)
#define PN544_SE_MODE_ON 0x01 #define PN544_SE_MODE_ON 0x01
static int pn544_hci_enable_se(struct nfc_hci_dev *hdev, u32 se_idx) static int pn544_hci_enable_se(struct nfc_hci_dev *hdev, u32 se_idx)
{ {
struct nfc_se *se; const struct nfc_se *se;
u8 enable = PN544_SE_MODE_ON; u8 enable = PN544_SE_MODE_ON;
static struct uicc_gatelist { static struct uicc_gatelist {
u8 head; u8 head;
...@@ -864,7 +864,7 @@ static int pn544_hci_enable_se(struct nfc_hci_dev *hdev, u32 se_idx) ...@@ -864,7 +864,7 @@ static int pn544_hci_enable_se(struct nfc_hci_dev *hdev, u32 se_idx)
static int pn544_hci_disable_se(struct nfc_hci_dev *hdev, u32 se_idx) static int pn544_hci_disable_se(struct nfc_hci_dev *hdev, u32 se_idx)
{ {
struct nfc_se *se; const struct nfc_se *se;
u8 disable = PN544_SE_MODE_OFF; u8 disable = PN544_SE_MODE_OFF;
se = nfc_find_se(hdev->ndev, se_idx); se = nfc_find_se(hdev->ndev, se_idx);
......
include/net/nfc/nci_core.h
View file @ 373a1f2b
...@@ -278,23 +278,25 @@ int nci_request(struct nci_dev *ndev, ...@@ -278,23 +278,25 @@ int nci_request(struct nci_dev *ndev,
void (*req)(struct nci_dev *ndev, void (*req)(struct nci_dev *ndev,
unsigned long opt), unsigned long opt),
unsigned long opt, __u32 timeout); unsigned long opt, __u32 timeout);
int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload); int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len,
int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len, __u8 *payload); const __u8 *payload);
int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len,
const __u8 *payload);
int nci_core_reset(struct nci_dev *ndev); int nci_core_reset(struct nci_dev *ndev);
int nci_core_init(struct nci_dev *ndev); int nci_core_init(struct nci_dev *ndev);
int nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb); int nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb);
int nci_send_frame(struct nci_dev *ndev, struct sk_buff *skb); int nci_send_frame(struct nci_dev *ndev, struct sk_buff *skb);
int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, __u8 *val); int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, const __u8 *val);
int nci_nfcee_discover(struct nci_dev *ndev, u8 action); int nci_nfcee_discover(struct nci_dev *ndev, u8 action);
int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode); int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode);
int nci_core_conn_create(struct nci_dev *ndev, u8 destination_type, int nci_core_conn_create(struct nci_dev *ndev, u8 destination_type,
u8 number_destination_params, u8 number_destination_params,
size_t params_len, size_t params_len,
struct core_conn_create_dest_spec_params *params); const struct core_conn_create_dest_spec_params *params);
int nci_core_conn_close(struct nci_dev *ndev, u8 conn_id); int nci_core_conn_close(struct nci_dev *ndev, u8 conn_id);
int nci_nfcc_loopback(struct nci_dev *ndev, void *data, size_t data_len, int nci_nfcc_loopback(struct nci_dev *ndev, const void *data, size_t data_len,
struct sk_buff **resp); struct sk_buff **resp);
struct nci_hci_dev *nci_hci_allocate(struct nci_dev *ndev); struct nci_hci_dev *nci_hci_allocate(struct nci_dev *ndev);
...@@ -378,7 +380,7 @@ void nci_req_complete(struct nci_dev *ndev, int result); ...@@ -378,7 +380,7 @@ 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, struct nci_conn_info *nci_get_conn_info_by_conn_id(struct nci_dev *ndev,
int conn_id); int conn_id);
int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type, int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type,
struct dest_spec_params *params); const struct dest_spec_params *params);
/* ----- NCI status code ----- */ /* ----- NCI status code ----- */
int nci_to_errno(__u8 code); int nci_to_errno(__u8 code);
......
include/net/nfc/nfc.h
View file @ 373a1f2b
...@@ -266,7 +266,7 @@ struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk, ...@@ -266,7 +266,7 @@ struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk,
struct sk_buff *nfc_alloc_recv_skb(unsigned int size, gfp_t gfp); struct sk_buff *nfc_alloc_recv_skb(unsigned int size, gfp_t gfp);
int nfc_set_remote_general_bytes(struct nfc_dev *dev, int nfc_set_remote_general_bytes(struct nfc_dev *dev,
u8 *gt, u8 gt_len); const u8 *gt, u8 gt_len);
u8 *nfc_get_local_general_bytes(struct nfc_dev *dev, size_t *gb_len); u8 *nfc_get_local_general_bytes(struct nfc_dev *dev, size_t *gb_len);
int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name, int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
...@@ -280,7 +280,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, ...@@ -280,7 +280,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
u8 comm_mode, u8 rf_mode); u8 comm_mode, u8 rf_mode);
int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode, int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,
u8 *gb, size_t gb_len); const u8 *gb, size_t gb_len);
int nfc_tm_deactivated(struct nfc_dev *dev); int nfc_tm_deactivated(struct nfc_dev *dev);
int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb); int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb);
......
net/nfc/af_nfc.c
View file @ 373a1f2b
...@@ -79,7 +79,7 @@ int __init af_nfc_init(void) ...@@ -79,7 +79,7 @@ int __init af_nfc_init(void)
return sock_register(&nfc_sock_family_ops); return sock_register(&nfc_sock_family_ops);
} }
void af_nfc_exit(void) void __exit af_nfc_exit(void)
{ {
sock_unregister(PF_NFC); sock_unregister(PF_NFC);
} }
net/nfc/core.c
View file @ 373a1f2b
...@@ -636,7 +636,7 @@ int nfc_disable_se(struct nfc_dev *dev, u32 se_idx) ...@@ -636,7 +636,7 @@ int nfc_disable_se(struct nfc_dev *dev, u32 se_idx)
return rc; return rc;
} }
int nfc_set_remote_general_bytes(struct nfc_dev *dev, u8 *gb, u8 gb_len) int nfc_set_remote_general_bytes(struct nfc_dev *dev, const u8 *gb, u8 gb_len)
{ {
pr_debug("dev_name=%s gb_len=%d\n", dev_name(&dev->dev), gb_len); pr_debug("dev_name=%s gb_len=%d\n", dev_name(&dev->dev), gb_len);
...@@ -665,7 +665,7 @@ int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb) ...@@ -665,7 +665,7 @@ int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb)
EXPORT_SYMBOL(nfc_tm_data_received); EXPORT_SYMBOL(nfc_tm_data_received);
int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode, int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,
u8 *gb, size_t gb_len) const u8 *gb, size_t gb_len)
{ {
int rc; int rc;
...@@ -824,7 +824,7 @@ EXPORT_SYMBOL(nfc_targets_found); ...@@ -824,7 +824,7 @@ EXPORT_SYMBOL(nfc_targets_found);
*/ */
int nfc_target_lost(struct nfc_dev *dev, u32 target_idx) int nfc_target_lost(struct nfc_dev *dev, u32 target_idx)
{ {
struct nfc_target *tg; const struct nfc_target *tg;
int i; int i;
pr_debug("dev_name %s n_target %d\n", dev_name(&dev->dev), target_idx); pr_debug("dev_name %s n_target %d\n", dev_name(&dev->dev), target_idx);
......
net/nfc/hci/core.c
View file @ 373a1f2b
...@@ -128,7 +128,7 @@ static void nfc_hci_msg_rx_work(struct work_struct *work) ...@@ -128,7 +128,7 @@ static void nfc_hci_msg_rx_work(struct work_struct *work)
struct nfc_hci_dev *hdev = container_of(work, struct nfc_hci_dev, struct nfc_hci_dev *hdev = container_of(work, struct nfc_hci_dev,
msg_rx_work); msg_rx_work);
struct sk_buff *skb; struct sk_buff *skb;
struct hcp_message *message; const struct hcp_message *message;
u8 pipe; u8 pipe;
u8 type; u8 type;
u8 instruction; u8 instruction;
...@@ -182,9 +182,9 @@ void nfc_hci_cmd_received(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd, ...@@ -182,9 +182,9 @@ void nfc_hci_cmd_received(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd,
struct sk_buff *skb) struct sk_buff *skb)
{ {
u8 status = NFC_HCI_ANY_OK; u8 status = NFC_HCI_ANY_OK;
struct hci_create_pipe_resp *create_info; const struct hci_create_pipe_resp *create_info;
struct hci_delete_pipe_noti *delete_info; const struct hci_delete_pipe_noti *delete_info;
struct hci_all_pipe_cleared_noti *cleared_info; const struct hci_all_pipe_cleared_noti *cleared_info;
u8 gate; u8 gate;
pr_debug("from pipe %x cmd %x\n", pipe, cmd); pr_debug("from pipe %x cmd %x\n", pipe, cmd);
......
net/nfc/hci/llc.c
View file @ 373a1f2b
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
static LIST_HEAD(llc_engines); static LIST_HEAD(llc_engines);
int nfc_llc_init(void) int __init nfc_llc_init(void)
{ {
int r; int r;
......
net/nfc/hci/llc_shdlc.c
View file @ 373a1f2b
...@@ -123,7 +123,7 @@ static bool llc_shdlc_x_lteq_y_lt_z(int x, int y, int z) ...@@ -123,7 +123,7 @@ static bool llc_shdlc_x_lteq_y_lt_z(int x, int y, int z)
return ((y >= x) || (y < z)) ? true : false; return ((y >= x) || (y < z)) ? true : false;
} }
static struct sk_buff *llc_shdlc_alloc_skb(struct llc_shdlc *shdlc, static struct sk_buff *llc_shdlc_alloc_skb(const struct llc_shdlc *shdlc,
int payload_len) int payload_len)
{ {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -137,7 +137,7 @@ static struct sk_buff *llc_shdlc_alloc_skb(struct llc_shdlc *shdlc, ...@@ -137,7 +137,7 @@ static struct sk_buff *llc_shdlc_alloc_skb(struct llc_shdlc *shdlc,
} }
/* immediately sends an S frame. */ /* immediately sends an S frame. */
static int llc_shdlc_send_s_frame(struct llc_shdlc *shdlc, static int llc_shdlc_send_s_frame(const struct llc_shdlc *shdlc,
enum sframe_type sframe_type, int nr) enum sframe_type sframe_type, int nr)
{ {
int r; int r;
...@@ -159,7 +159,7 @@ static int llc_shdlc_send_s_frame(struct llc_shdlc *shdlc, ...@@ -159,7 +159,7 @@ static int llc_shdlc_send_s_frame(struct llc_shdlc *shdlc,
} }
/* immediately sends an U frame. skb may contain optional payload */ /* immediately sends an U frame. skb may contain optional payload */
static int llc_shdlc_send_u_frame(struct llc_shdlc *shdlc, static int llc_shdlc_send_u_frame(const struct llc_shdlc *shdlc,
struct sk_buff *skb, struct sk_buff *skb,
enum uframe_modifier uframe_modifier) enum uframe_modifier uframe_modifier)
{ {
...@@ -361,7 +361,7 @@ static void llc_shdlc_connect_complete(struct llc_shdlc *shdlc, int r) ...@@ -361,7 +361,7 @@ static void llc_shdlc_connect_complete(struct llc_shdlc *shdlc, int r)
wake_up(shdlc->connect_wq); wake_up(shdlc->connect_wq);
} }
static int llc_shdlc_connect_initiate(struct llc_shdlc *shdlc) static int llc_shdlc_connect_initiate(const struct llc_shdlc *shdlc)
{ {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -377,7 +377,7 @@ static int llc_shdlc_connect_initiate(struct llc_shdlc *shdlc) ...@@ -377,7 +377,7 @@ static int llc_shdlc_connect_initiate(struct llc_shdlc *shdlc)
return llc_shdlc_send_u_frame(shdlc, skb, U_FRAME_RSET); return llc_shdlc_send_u_frame(shdlc, skb, U_FRAME_RSET);
} }
static int llc_shdlc_connect_send_ua(struct llc_shdlc *shdlc) static int llc_shdlc_connect_send_ua(const struct llc_shdlc *shdlc)
{ {
struct sk_buff *skb; struct sk_buff *skb;
......
net/nfc/llcp.h
View file @ 373a1f2b
...@@ -221,15 +221,15 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *sk, struct socket *newsock); ...@@ -221,15 +221,15 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *sk, struct socket *newsock);
/* TLV API */ /* TLV API */
int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local, int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,
u8 *tlv_array, u16 tlv_array_len); const u8 *tlv_array, u16 tlv_array_len);
int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock, int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,
u8 *tlv_array, u16 tlv_array_len); const u8 *tlv_array, u16 tlv_array_len);
/* Commands API */ /* Commands API */
void nfc_llcp_recv(void *data, struct sk_buff *skb, int err); void nfc_llcp_recv(void *data, struct sk_buff *skb, int err);
u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length); u8 *nfc_llcp_build_tlv(u8 type, const u8 *value, u8 value_length, u8 *tlv_length);
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap); struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap);
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri, struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, const char *uri,
size_t uri_len); size_t uri_len);
void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp); void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp);
void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head); void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head);
......
net/nfc/llcp_commands.c
View file @ 373a1f2b
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "nfc.h" #include "nfc.h"
#include "llcp.h" #include "llcp.h"
static u8 llcp_tlv_length[LLCP_TLV_MAX] = { static const u8 llcp_tlv_length[LLCP_TLV_MAX] = {
0, 0,
1, /* VERSION */ 1, /* VERSION */
2, /* MIUX */ 2, /* MIUX */
...@@ -29,7 +29,7 @@ static u8 llcp_tlv_length[LLCP_TLV_MAX] = { ...@@ -29,7 +29,7 @@ static u8 llcp_tlv_length[LLCP_TLV_MAX] = {
}; };
static u8 llcp_tlv8(u8 *tlv, u8 type) static u8 llcp_tlv8(const u8 *tlv, u8 type)
{ {
if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]]) if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]])
return 0; return 0;
...@@ -37,7 +37,7 @@ static u8 llcp_tlv8(u8 *tlv, u8 type) ...@@ -37,7 +37,7 @@ static u8 llcp_tlv8(u8 *tlv, u8 type)
return tlv[2]; return tlv[2];
} }
static u16 llcp_tlv16(u8 *tlv, u8 type) static u16 llcp_tlv16(const u8 *tlv, u8 type)
{ {
if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]]) if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]])
return 0; return 0;
...@@ -46,37 +46,37 @@ static u16 llcp_tlv16(u8 *tlv, u8 type) ...@@ -46,37 +46,37 @@ static u16 llcp_tlv16(u8 *tlv, u8 type)
} }
static u8 llcp_tlv_version(u8 *tlv) static u8 llcp_tlv_version(const u8 *tlv)
{ {
return llcp_tlv8(tlv, LLCP_TLV_VERSION); return llcp_tlv8(tlv, LLCP_TLV_VERSION);
} }
static u16 llcp_tlv_miux(u8 *tlv) static u16 llcp_tlv_miux(const u8 *tlv)
{ {
return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7ff; return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7ff;
} }
static u16 llcp_tlv_wks(u8 *tlv) static u16 llcp_tlv_wks(const u8 *tlv)
{ {
return llcp_tlv16(tlv, LLCP_TLV_WKS); return llcp_tlv16(tlv, LLCP_TLV_WKS);
} }
static u16 llcp_tlv_lto(u8 *tlv) static u16 llcp_tlv_lto(const u8 *tlv)
{ {
return llcp_tlv8(tlv, LLCP_TLV_LTO); return llcp_tlv8(tlv, LLCP_TLV_LTO);
} }
static u8 llcp_tlv_opt(u8 *tlv) static u8 llcp_tlv_opt(const u8 *tlv)
{ {
return llcp_tlv8(tlv, LLCP_TLV_OPT); return llcp_tlv8(tlv, LLCP_TLV_OPT);
} }
static u8 llcp_tlv_rw(u8 *tlv) static u8 llcp_tlv_rw(const u8 *tlv)
{ {
return llcp_tlv8(tlv, LLCP_TLV_RW) & 0xf; return llcp_tlv8(tlv, LLCP_TLV_RW) & 0xf;
} }
u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length) u8 *nfc_llcp_build_tlv(u8 type, const u8 *value, u8 value_length, u8 *tlv_length)
{ {
u8 *tlv, length; u8 *tlv, length;
...@@ -130,7 +130,7 @@ struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap) ...@@ -130,7 +130,7 @@ struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap)
return sdres; return sdres;
} }
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri, struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, const char *uri,
size_t uri_len) size_t uri_len)
{ {
struct nfc_llcp_sdp_tlv *sdreq; struct nfc_llcp_sdp_tlv *sdreq;
...@@ -190,9 +190,10 @@ void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head) ...@@ -190,9 +190,10 @@ void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head)
} }
int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local, int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,
u8 *tlv_array, u16 tlv_array_len) const u8 *tlv_array, u16 tlv_array_len)
{ {
u8 *tlv = tlv_array, type, length, offset = 0; const u8 *tlv = tlv_array;
u8 type, length, offset = 0;
pr_debug("TLV array length %d\n", tlv_array_len); pr_debug("TLV array length %d\n", tlv_array_len);
...@@ -239,9 +240,10 @@ int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local, ...@@ -239,9 +240,10 @@ int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,
} }
int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock, int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,
u8 *tlv_array, u16 tlv_array_len) const u8 *tlv_array, u16 tlv_array_len)
{ {
u8 *tlv = tlv_array, type, length, offset = 0; const u8 *tlv = tlv_array;
u8 type, length, offset = 0;
pr_debug("TLV array length %d\n", tlv_array_len); pr_debug("TLV array length %d\n", tlv_array_len);
...@@ -295,7 +297,7 @@ static struct sk_buff *llcp_add_header(struct sk_buff *pdu, ...@@ -295,7 +297,7 @@ static struct sk_buff *llcp_add_header(struct sk_buff *pdu,
return pdu; return pdu;
} }
static struct sk_buff *llcp_add_tlv(struct sk_buff *pdu, u8 *tlv, static struct sk_buff *llcp_add_tlv(struct sk_buff *pdu, const u8 *tlv,
u8 tlv_length) u8 tlv_length)
{ {
/* XXX Add an skb length check */ /* XXX Add an skb length check */
...@@ -389,9 +391,10 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock) ...@@ -389,9 +391,10 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)
{ {
struct nfc_llcp_local *local; struct nfc_llcp_local *local;
struct sk_buff *skb; struct sk_buff *skb;
u8 *service_name_tlv = NULL, service_name_tlv_length; const u8 *service_name_tlv = NULL;
u8 *miux_tlv = NULL, miux_tlv_length; const u8 *miux_tlv = NULL;
u8 *rw_tlv = NULL, rw_tlv_length, rw; const u8 *rw_tlv = NULL;
u8 service_name_tlv_length, miux_tlv_length, rw_tlv_length, rw;
int err; int err;
u16 size = 0; u16 size = 0;
__be16 miux; __be16 miux;
...@@ -465,8 +468,9 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock) ...@@ -465,8 +468,9 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock)
{ {
struct nfc_llcp_local *local; struct nfc_llcp_local *local;
struct sk_buff *skb; struct sk_buff *skb;
u8 *miux_tlv = NULL, miux_tlv_length; const u8 *miux_tlv = NULL;
u8 *rw_tlv = NULL, rw_tlv_length, rw; const u8 *rw_tlv = NULL;
u8 miux_tlv_length, rw_tlv_length, rw;
int err; int err;
u16 size = 0; u16 size = 0;
__be16 miux; __be16 miux;
......
net/nfc/llcp_core.c
View file @ 373a1f2b
...@@ -301,7 +301,7 @@ static char *wks[] = { ...@@ -301,7 +301,7 @@ static char *wks[] = {
"urn:nfc:sn:snep", "urn:nfc:sn:snep",
}; };
static int nfc_llcp_wks_sap(char *service_name, size_t service_name_len) static int nfc_llcp_wks_sap(const char *service_name, size_t service_name_len)
{ {
int sap, num_wks; int sap, num_wks;
...@@ -325,7 +325,7 @@ static int nfc_llcp_wks_sap(char *service_name, size_t service_name_len) ...@@ -325,7 +325,7 @@ static int nfc_llcp_wks_sap(char *service_name, size_t service_name_len)
static static
struct nfc_llcp_sock *nfc_llcp_sock_from_sn(struct nfc_llcp_local *local, struct nfc_llcp_sock *nfc_llcp_sock_from_sn(struct nfc_llcp_local *local,
u8 *sn, size_t sn_len) const u8 *sn, size_t sn_len)
{ {
struct sock *sk; struct sock *sk;
struct nfc_llcp_sock *llcp_sock, *tmp_sock; struct nfc_llcp_sock *llcp_sock, *tmp_sock;
...@@ -522,7 +522,7 @@ static int nfc_llcp_build_gb(struct nfc_llcp_local *local) ...@@ -522,7 +522,7 @@ static int nfc_llcp_build_gb(struct nfc_llcp_local *local)
{ {
u8 *gb_cur, version, version_length; u8 *gb_cur, version, version_length;
u8 lto_length, wks_length, miux_length; u8 lto_length, wks_length, miux_length;
u8 *version_tlv = NULL, *lto_tlv = NULL, const u8 *version_tlv = NULL, *lto_tlv = NULL,
*wks_tlv = NULL, *miux_tlv = NULL; *wks_tlv = NULL, *miux_tlv = NULL;
__be16 wks = cpu_to_be16(local->local_wks); __be16 wks = cpu_to_be16(local->local_wks);
u8 gb_len = 0; u8 gb_len = 0;
...@@ -612,7 +612,7 @@ u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *general_bytes_len) ...@@ -612,7 +612,7 @@ u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *general_bytes_len)
return local->gb; return local->gb;
} }
int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len) int nfc_llcp_set_remote_gb(struct nfc_dev *dev, const u8 *gb, u8 gb_len)
{ {
struct nfc_llcp_local *local; struct nfc_llcp_local *local;
...@@ -639,27 +639,27 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len) ...@@ -639,27 +639,27 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len)
local->remote_gb_len - 3); local->remote_gb_len - 3);
} }
static u8 nfc_llcp_dsap(struct sk_buff *pdu) static u8 nfc_llcp_dsap(const struct sk_buff *pdu)
{ {
return (pdu->data[0] & 0xfc) >> 2; return (pdu->data[0] & 0xfc) >> 2;
} }
static u8 nfc_llcp_ptype(struct sk_buff *pdu) static u8 nfc_llcp_ptype(const struct sk_buff *pdu)
{ {
return ((pdu->data[0] & 0x03) << 2) | ((pdu->data[1] & 0xc0) >> 6); return ((pdu->data[0] & 0x03) << 2) | ((pdu->data[1] & 0xc0) >> 6);
} }
static u8 nfc_llcp_ssap(struct sk_buff *pdu) static u8 nfc_llcp_ssap(const struct sk_buff *pdu)
{ {
return pdu->data[1] & 0x3f; return pdu->data[1] & 0x3f;
} }
static u8 nfc_llcp_ns(struct sk_buff *pdu) static u8 nfc_llcp_ns(const struct sk_buff *pdu)
{ {
return pdu->data[2] >> 4; return pdu->data[2] >> 4;
} }
static u8 nfc_llcp_nr(struct sk_buff *pdu) static u8 nfc_llcp_nr(const struct sk_buff *pdu)
{ {
return pdu->data[2] & 0xf; return pdu->data[2] & 0xf;
} }
...@@ -801,7 +801,7 @@ static struct nfc_llcp_sock *nfc_llcp_connecting_sock_get(struct nfc_llcp_local ...@@ -801,7 +801,7 @@ static struct nfc_llcp_sock *nfc_llcp_connecting_sock_get(struct nfc_llcp_local
} }
static struct nfc_llcp_sock *nfc_llcp_sock_get_sn(struct nfc_llcp_local *local, static struct nfc_llcp_sock *nfc_llcp_sock_get_sn(struct nfc_llcp_local *local,
u8 *sn, size_t sn_len) const u8 *sn, size_t sn_len)
{ {
struct nfc_llcp_sock *llcp_sock; struct nfc_llcp_sock *llcp_sock;
...@@ -815,9 +815,10 @@ static struct nfc_llcp_sock *nfc_llcp_sock_get_sn(struct nfc_llcp_local *local, ...@@ -815,9 +815,10 @@ static struct nfc_llcp_sock *nfc_llcp_sock_get_sn(struct nfc_llcp_local *local,
return llcp_sock; return llcp_sock;
} }
static u8 *nfc_llcp_connect_sn(struct sk_buff *skb, size_t *sn_len) static const u8 *nfc_llcp_connect_sn(const struct sk_buff *skb, size_t *sn_len)
{ {
u8 *tlv = &skb->data[2], type, length; u8 type, length;
const u8 *tlv = &skb->data[2];
size_t tlv_array_len = skb->len - LLCP_HEADER_SIZE, offset = 0; size_t tlv_array_len = skb->len - LLCP_HEADER_SIZE, offset = 0;
while (offset < tlv_array_len) { while (offset < tlv_array_len) {
...@@ -875,7 +876,7 @@ static void nfc_llcp_recv_ui(struct nfc_llcp_local *local, ...@@ -875,7 +876,7 @@ static void nfc_llcp_recv_ui(struct nfc_llcp_local *local,
} }
static void nfc_llcp_recv_connect(struct nfc_llcp_local *local, static void nfc_llcp_recv_connect(struct nfc_llcp_local *local,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
struct sock *new_sk, *parent; struct sock *new_sk, *parent;
struct nfc_llcp_sock *sock, *new_sock; struct nfc_llcp_sock *sock, *new_sock;
...@@ -893,7 +894,7 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local, ...@@ -893,7 +894,7 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local,
goto fail; goto fail;
} }
} else { } else {
u8 *sn; const u8 *sn;
size_t sn_len; size_t sn_len;
sn = nfc_llcp_connect_sn(skb, &sn_len); sn = nfc_llcp_connect_sn(skb, &sn_len);
...@@ -1112,7 +1113,7 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local, ...@@ -1112,7 +1113,7 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,
} }
static void nfc_llcp_recv_disc(struct nfc_llcp_local *local, static void nfc_llcp_recv_disc(struct nfc_llcp_local *local,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
struct nfc_llcp_sock *llcp_sock; struct nfc_llcp_sock *llcp_sock;
struct sock *sk; struct sock *sk;
...@@ -1155,7 +1156,8 @@ static void nfc_llcp_recv_disc(struct nfc_llcp_local *local, ...@@ -1155,7 +1156,8 @@ static void nfc_llcp_recv_disc(struct nfc_llcp_local *local,
nfc_llcp_sock_put(llcp_sock); nfc_llcp_sock_put(llcp_sock);
} }
static void nfc_llcp_recv_cc(struct nfc_llcp_local *local, struct sk_buff *skb) static void nfc_llcp_recv_cc(struct nfc_llcp_local *local,
const struct sk_buff *skb)
{ {
struct nfc_llcp_sock *llcp_sock; struct nfc_llcp_sock *llcp_sock;
struct sock *sk; struct sock *sk;
...@@ -1188,7 +1190,8 @@ static void nfc_llcp_recv_cc(struct nfc_llcp_local *local, struct sk_buff *skb) ...@@ -1188,7 +1190,8 @@ static void nfc_llcp_recv_cc(struct nfc_llcp_local *local, struct sk_buff *skb)
nfc_llcp_sock_put(llcp_sock); nfc_llcp_sock_put(llcp_sock);
} }
static void nfc_llcp_recv_dm(struct nfc_llcp_local *local, struct sk_buff *skb) static void nfc_llcp_recv_dm(struct nfc_llcp_local *local,
const struct sk_buff *skb)
{ {
struct nfc_llcp_sock *llcp_sock; struct nfc_llcp_sock *llcp_sock;
struct sock *sk; struct sock *sk;
...@@ -1226,12 +1229,13 @@ static void nfc_llcp_recv_dm(struct nfc_llcp_local *local, struct sk_buff *skb) ...@@ -1226,12 +1229,13 @@ static void nfc_llcp_recv_dm(struct nfc_llcp_local *local, struct sk_buff *skb)
} }
static void nfc_llcp_recv_snl(struct nfc_llcp_local *local, static void nfc_llcp_recv_snl(struct nfc_llcp_local *local,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
struct nfc_llcp_sock *llcp_sock; struct nfc_llcp_sock *llcp_sock;
u8 dsap, ssap, *tlv, type, length, tid, sap; u8 dsap, ssap, type, length, tid, sap;
const u8 *tlv;
u16 tlv_len, offset; u16 tlv_len, offset;
char *service_name; const char *service_name;
size_t service_name_len; size_t service_name_len;
struct nfc_llcp_sdp_tlv *sdp; struct nfc_llcp_sdp_tlv *sdp;
HLIST_HEAD(llc_sdres_list); HLIST_HEAD(llc_sdres_list);
......
net/nfc/nci/core.c
View file @ 373a1f2b
...@@ -53,9 +53,9 @@ struct nci_conn_info *nci_get_conn_info_by_conn_id(struct nci_dev *ndev, ...@@ -53,9 +53,9 @@ struct nci_conn_info *nci_get_conn_info_by_conn_id(struct nci_dev *ndev,
} }
int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type, int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type,
struct dest_spec_params *params) const struct dest_spec_params *params)
{ {
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
list_for_each_entry(conn_info, &ndev->conn_info_list, list) { list_for_each_entry(conn_info, &ndev->conn_info_list, list) {
if (conn_info->dest_type == dest_type) { if (conn_info->dest_type == dest_type) {
...@@ -210,14 +210,15 @@ static void nci_init_complete_req(struct nci_dev *ndev, unsigned long opt) ...@@ -210,14 +210,15 @@ static void nci_init_complete_req(struct nci_dev *ndev, unsigned long opt)
} }
struct nci_set_config_param { struct nci_set_config_param {
__u8 id; __u8 id;
size_t len; size_t len;
__u8 *val; const __u8 *val;
}; };
static void nci_set_config_req(struct nci_dev *ndev, unsigned long opt) static void nci_set_config_req(struct nci_dev *ndev, unsigned long opt)
{ {
struct nci_set_config_param *param = (struct nci_set_config_param *)opt; const struct nci_set_config_param *param =
(struct nci_set_config_param *)opt;
struct nci_core_set_config_cmd cmd; struct nci_core_set_config_cmd cmd;
BUG_ON(param->len > NCI_MAX_PARAM_LEN); BUG_ON(param->len > NCI_MAX_PARAM_LEN);
...@@ -237,7 +238,7 @@ struct nci_rf_discover_param { ...@@ -237,7 +238,7 @@ struct nci_rf_discover_param {
static void nci_rf_discover_req(struct nci_dev *ndev, unsigned long opt) static void nci_rf_discover_req(struct nci_dev *ndev, unsigned long opt)
{ {
struct nci_rf_discover_param *param = const struct nci_rf_discover_param *param =
(struct nci_rf_discover_param *)opt; (struct nci_rf_discover_param *)opt;
struct nci_rf_disc_cmd cmd; struct nci_rf_disc_cmd cmd;
...@@ -303,7 +304,7 @@ struct nci_rf_discover_select_param { ...@@ -303,7 +304,7 @@ struct nci_rf_discover_select_param {
static void nci_rf_discover_select_req(struct nci_dev *ndev, unsigned long opt) static void nci_rf_discover_select_req(struct nci_dev *ndev, unsigned long opt)
{ {
struct nci_rf_discover_select_param *param = const struct nci_rf_discover_select_param *param =
(struct nci_rf_discover_select_param *)opt; (struct nci_rf_discover_select_param *)opt;
struct nci_rf_discover_select_cmd cmd; struct nci_rf_discover_select_cmd cmd;
...@@ -341,18 +342,18 @@ static void nci_rf_deactivate_req(struct nci_dev *ndev, unsigned long opt) ...@@ -341,18 +342,18 @@ static void nci_rf_deactivate_req(struct nci_dev *ndev, unsigned long opt)
struct nci_cmd_param { struct nci_cmd_param {
__u16 opcode; __u16 opcode;
size_t len; size_t len;
__u8 *payload; const __u8 *payload;
}; };
static void nci_generic_req(struct nci_dev *ndev, unsigned long opt) static void nci_generic_req(struct nci_dev *ndev, unsigned long opt)
{ {
struct nci_cmd_param *param = const struct nci_cmd_param *param =
(struct nci_cmd_param *)opt; (struct nci_cmd_param *)opt;
nci_send_cmd(ndev, param->opcode, param->len, param->payload); nci_send_cmd(ndev, param->opcode, param->len, param->payload);
} }
int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload) int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, const __u8 *payload)
{ {
struct nci_cmd_param param; struct nci_cmd_param param;
...@@ -365,7 +366,8 @@ int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload) ...@@ -365,7 +366,8 @@ int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload)
} }
EXPORT_SYMBOL(nci_prop_cmd); EXPORT_SYMBOL(nci_prop_cmd);
int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len, __u8 *payload) int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len,
const __u8 *payload)
{ {
struct nci_cmd_param param; struct nci_cmd_param param;
...@@ -399,7 +401,7 @@ struct nci_loopback_data { ...@@ -399,7 +401,7 @@ struct nci_loopback_data {
static void nci_send_data_req(struct nci_dev *ndev, unsigned long opt) static void nci_send_data_req(struct nci_dev *ndev, unsigned long opt)
{ {
struct nci_loopback_data *data = (struct nci_loopback_data *)opt; const struct nci_loopback_data *data = (struct nci_loopback_data *)opt;
nci_send_data(ndev, data->conn_id, data->data); nci_send_data(ndev, data->conn_id, data->data);
} }
...@@ -407,7 +409,7 @@ static void nci_send_data_req(struct nci_dev *ndev, unsigned long opt) ...@@ -407,7 +409,7 @@ static void nci_send_data_req(struct nci_dev *ndev, unsigned long opt)
static void nci_nfcc_loopback_cb(void *context, struct sk_buff *skb, int err) static void nci_nfcc_loopback_cb(void *context, struct sk_buff *skb, int err)
{ {
struct nci_dev *ndev = (struct nci_dev *)context; struct nci_dev *ndev = (struct nci_dev *)context;
struct nci_conn_info *conn_info; struct nci_conn_info *conn_info;
conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_conn_id); conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_conn_id);
if (!conn_info) { if (!conn_info) {
...@@ -420,7 +422,7 @@ static void nci_nfcc_loopback_cb(void *context, struct sk_buff *skb, int err) ...@@ -420,7 +422,7 @@ static void nci_nfcc_loopback_cb(void *context, struct sk_buff *skb, int err)
nci_req_complete(ndev, NCI_STATUS_OK); nci_req_complete(ndev, NCI_STATUS_OK);
} }
int nci_nfcc_loopback(struct nci_dev *ndev, void *data, size_t data_len, int nci_nfcc_loopback(struct nci_dev *ndev, const void *data, size_t data_len,
struct sk_buff **resp) struct sk_buff **resp)
{ {
int r; int r;
...@@ -624,7 +626,7 @@ static int nci_dev_down(struct nfc_dev *nfc_dev) ...@@ -624,7 +626,7 @@ static int nci_dev_down(struct nfc_dev *nfc_dev)
return nci_close_device(ndev); return nci_close_device(ndev);
} }
int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, __u8 *val) int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, const __u8 *val)
{ {
struct nci_set_config_param param; struct nci_set_config_param param;
...@@ -659,7 +661,7 @@ EXPORT_SYMBOL(nci_nfcee_discover); ...@@ -659,7 +661,7 @@ EXPORT_SYMBOL(nci_nfcee_discover);
static void nci_nfcee_mode_set_req(struct nci_dev *ndev, unsigned long opt) static void nci_nfcee_mode_set_req(struct nci_dev *ndev, unsigned long opt)
{ {
struct nci_nfcee_mode_set_cmd *cmd = const struct nci_nfcee_mode_set_cmd *cmd =
(struct nci_nfcee_mode_set_cmd *)opt; (struct nci_nfcee_mode_set_cmd *)opt;
nci_send_cmd(ndev, NCI_OP_NFCEE_MODE_SET_CMD, nci_send_cmd(ndev, NCI_OP_NFCEE_MODE_SET_CMD,
...@@ -681,7 +683,7 @@ EXPORT_SYMBOL(nci_nfcee_mode_set); ...@@ -681,7 +683,7 @@ EXPORT_SYMBOL(nci_nfcee_mode_set);
static void nci_core_conn_create_req(struct nci_dev *ndev, unsigned long opt) static void nci_core_conn_create_req(struct nci_dev *ndev, unsigned long opt)
{ {
struct core_conn_create_data *data = const struct core_conn_create_data *data =
(struct core_conn_create_data *)opt; (struct core_conn_create_data *)opt;
nci_send_cmd(ndev, NCI_OP_CORE_CONN_CREATE_CMD, data->length, data->cmd); nci_send_cmd(ndev, NCI_OP_CORE_CONN_CREATE_CMD, data->length, data->cmd);
...@@ -690,7 +692,7 @@ static void nci_core_conn_create_req(struct nci_dev *ndev, unsigned long opt) ...@@ -690,7 +692,7 @@ static void nci_core_conn_create_req(struct nci_dev *ndev, unsigned long opt)
int nci_core_conn_create(struct nci_dev *ndev, u8 destination_type, int nci_core_conn_create(struct nci_dev *ndev, u8 destination_type,
u8 number_destination_params, u8 number_destination_params,
size_t params_len, size_t params_len,
struct core_conn_create_dest_spec_params *params) const struct core_conn_create_dest_spec_params *params)
{ {
int r; int r;
struct nci_core_conn_create_cmd *cmd; struct nci_core_conn_create_cmd *cmd;
...@@ -863,7 +865,7 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, ...@@ -863,7 +865,7 @@ static int nci_activate_target(struct nfc_dev *nfc_dev,
{ {
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
struct nci_rf_discover_select_param param; struct nci_rf_discover_select_param param;
struct nfc_target *nci_target = NULL; const struct nfc_target *nci_target = NULL;
int i; int i;
int rc = 0; int rc = 0;
...@@ -1004,7 +1006,7 @@ static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target, ...@@ -1004,7 +1006,7 @@ static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target,
{ {
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
int rc; int rc;
struct nci_conn_info *conn_info; struct nci_conn_info *conn_info;
conn_info = ndev->rf_conn_info; conn_info = ndev->rf_conn_info;
if (!conn_info) if (!conn_info)
...@@ -1269,7 +1271,7 @@ EXPORT_SYMBOL(nci_register_device); ...@@ -1269,7 +1271,7 @@ EXPORT_SYMBOL(nci_register_device);
*/ */
void nci_unregister_device(struct nci_dev *ndev) void nci_unregister_device(struct nci_dev *ndev)
{ {
struct nci_conn_info *conn_info, *n; struct nci_conn_info *conn_info, *n;
nci_close_device(ndev); nci_close_device(ndev);
...@@ -1441,7 +1443,7 @@ int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode, ...@@ -1441,7 +1443,7 @@ int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode,
static void nci_tx_work(struct work_struct *work) static void nci_tx_work(struct work_struct *work)
{ {
struct nci_dev *ndev = container_of(work, struct nci_dev, tx_work); struct nci_dev *ndev = container_of(work, struct nci_dev, tx_work);
struct nci_conn_info *conn_info; struct nci_conn_info *conn_info;
struct sk_buff *skb; struct sk_buff *skb;
conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_conn_id); conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_conn_id);
......
net/nfc/nci/data.c
View file @ 373a1f2b
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb, void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,
__u8 conn_id, int err) __u8 conn_id, int err)
{ {
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
data_exchange_cb_t cb; data_exchange_cb_t cb;
void *cb_context; void *cb_context;
...@@ -80,7 +80,7 @@ static inline void nci_push_data_hdr(struct nci_dev *ndev, ...@@ -80,7 +80,7 @@ static inline void nci_push_data_hdr(struct nci_dev *ndev,
int nci_conn_max_data_pkt_payload_size(struct nci_dev *ndev, __u8 conn_id) int nci_conn_max_data_pkt_payload_size(struct nci_dev *ndev, __u8 conn_id)
{ {
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
conn_info = nci_get_conn_info_by_conn_id(ndev, conn_id); conn_info = nci_get_conn_info_by_conn_id(ndev, conn_id);
if (!conn_info) if (!conn_info)
...@@ -93,9 +93,9 @@ EXPORT_SYMBOL(nci_conn_max_data_pkt_payload_size); ...@@ -93,9 +93,9 @@ EXPORT_SYMBOL(nci_conn_max_data_pkt_payload_size);
static int nci_queue_tx_data_frags(struct nci_dev *ndev, static int nci_queue_tx_data_frags(struct nci_dev *ndev,
__u8 conn_id, __u8 conn_id,
struct sk_buff *skb) { struct sk_buff *skb) {
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
int total_len = skb->len; int total_len = skb->len;
unsigned char *data = skb->data; const unsigned char *data = skb->data;
unsigned long flags; unsigned long flags;
struct sk_buff_head frags_q; struct sk_buff_head frags_q;
struct sk_buff *skb_frag; struct sk_buff *skb_frag;
...@@ -166,7 +166,7 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev, ...@@ -166,7 +166,7 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev,
/* Send NCI data */ /* Send NCI data */
int nci_send_data(struct nci_dev *ndev, __u8 conn_id, struct sk_buff *skb) int nci_send_data(struct nci_dev *ndev, __u8 conn_id, struct sk_buff *skb)
{ {
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
int rc = 0; int rc = 0;
pr_debug("conn_id 0x%x, plen %d\n", conn_id, skb->len); pr_debug("conn_id 0x%x, plen %d\n", conn_id, skb->len);
...@@ -269,7 +269,7 @@ void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb) ...@@ -269,7 +269,7 @@ void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb)
__u8 pbf = nci_pbf(skb->data); __u8 pbf = nci_pbf(skb->data);
__u8 status = 0; __u8 status = 0;
__u8 conn_id = nci_conn_id(skb->data); __u8 conn_id = nci_conn_id(skb->data);
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
pr_debug("len %d\n", skb->len); pr_debug("len %d\n", skb->len);
......
net/nfc/nci/hci.c
View file @ 373a1f2b
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
#include <linux/nfc.h> #include <linux/nfc.h>
struct nci_data { struct nci_data {
u8 conn_id; u8 conn_id;
u8 pipe; u8 pipe;
u8 cmd; u8 cmd;
const u8 *data; const u8 *data;
u32 data_len; u32 data_len;
} __packed; } __packed;
struct nci_hci_create_pipe_params { struct nci_hci_create_pipe_params {
...@@ -142,7 +142,7 @@ static int nci_hci_send_data(struct nci_dev *ndev, u8 pipe, ...@@ -142,7 +142,7 @@ static int nci_hci_send_data(struct nci_dev *ndev, u8 pipe,
const u8 data_type, const u8 *data, const u8 data_type, const u8 *data,
size_t data_len) size_t data_len)
{ {
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
struct sk_buff *skb; struct sk_buff *skb;
int len, i, r; int len, i, r;
u8 cb = pipe; u8 cb = pipe;
...@@ -197,7 +197,7 @@ static int nci_hci_send_data(struct nci_dev *ndev, u8 pipe, ...@@ -197,7 +197,7 @@ static int nci_hci_send_data(struct nci_dev *ndev, u8 pipe,
static void nci_hci_send_data_req(struct nci_dev *ndev, unsigned long opt) static void nci_hci_send_data_req(struct nci_dev *ndev, unsigned long opt)
{ {
struct nci_data *data = (struct nci_data *)opt; const struct nci_data *data = (struct nci_data *)opt;
nci_hci_send_data(ndev, data->pipe, data->cmd, nci_hci_send_data(ndev, data->pipe, data->cmd,
data->data, data->data_len); data->data, data->data_len);
...@@ -221,8 +221,8 @@ int nci_hci_send_cmd(struct nci_dev *ndev, u8 gate, u8 cmd, ...@@ -221,8 +221,8 @@ int nci_hci_send_cmd(struct nci_dev *ndev, u8 gate, u8 cmd,
const u8 *param, size_t param_len, const u8 *param, size_t param_len,
struct sk_buff **skb) struct sk_buff **skb)
{ {
struct nci_hcp_message *message; const struct nci_hcp_message *message;
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
struct nci_data data; struct nci_data data;
int r; int r;
u8 pipe = ndev->hci_dev->gate2pipe[gate]; u8 pipe = ndev->hci_dev->gate2pipe[gate];
...@@ -363,7 +363,7 @@ static void nci_hci_cmd_received(struct nci_dev *ndev, u8 pipe, ...@@ -363,7 +363,7 @@ static void nci_hci_cmd_received(struct nci_dev *ndev, u8 pipe,
static void nci_hci_resp_received(struct nci_dev *ndev, u8 pipe, static void nci_hci_resp_received(struct nci_dev *ndev, u8 pipe,
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct nci_conn_info *conn_info; struct nci_conn_info *conn_info;
conn_info = ndev->hci_dev->conn_info; conn_info = ndev->hci_dev->conn_info;
if (!conn_info) if (!conn_info)
...@@ -406,7 +406,7 @@ static void nci_hci_msg_rx_work(struct work_struct *work) ...@@ -406,7 +406,7 @@ static void nci_hci_msg_rx_work(struct work_struct *work)
struct nci_hci_dev *hdev = struct nci_hci_dev *hdev =
container_of(work, struct nci_hci_dev, msg_rx_work); container_of(work, struct nci_hci_dev, msg_rx_work);
struct sk_buff *skb; struct sk_buff *skb;
struct nci_hcp_message *message; const struct nci_hcp_message *message;
u8 pipe, type, instruction; u8 pipe, type, instruction;
while ((skb = skb_dequeue(&hdev->msg_rx_queue)) != NULL) { while ((skb = skb_dequeue(&hdev->msg_rx_queue)) != NULL) {
...@@ -498,7 +498,7 @@ void nci_hci_data_received_cb(void *context, ...@@ -498,7 +498,7 @@ void nci_hci_data_received_cb(void *context,
int nci_hci_open_pipe(struct nci_dev *ndev, u8 pipe) int nci_hci_open_pipe(struct nci_dev *ndev, u8 pipe)
{ {
struct nci_data data; struct nci_data data;
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
conn_info = ndev->hci_dev->conn_info; conn_info = ndev->hci_dev->conn_info;
if (!conn_info) if (!conn_info)
...@@ -523,7 +523,7 @@ static u8 nci_hci_create_pipe(struct nci_dev *ndev, u8 dest_host, ...@@ -523,7 +523,7 @@ static u8 nci_hci_create_pipe(struct nci_dev *ndev, u8 dest_host,
u8 pipe; u8 pipe;
struct sk_buff *skb; struct sk_buff *skb;
struct nci_hci_create_pipe_params params; struct nci_hci_create_pipe_params params;
struct nci_hci_create_pipe_resp *resp; const struct nci_hci_create_pipe_resp *resp;
pr_debug("gate=%d\n", dest_gate); pr_debug("gate=%d\n", dest_gate);
...@@ -557,8 +557,8 @@ static int nci_hci_delete_pipe(struct nci_dev *ndev, u8 pipe) ...@@ -557,8 +557,8 @@ static int nci_hci_delete_pipe(struct nci_dev *ndev, u8 pipe)
int nci_hci_set_param(struct nci_dev *ndev, u8 gate, u8 idx, int nci_hci_set_param(struct nci_dev *ndev, u8 gate, u8 idx,
const u8 *param, size_t param_len) const u8 *param, size_t param_len)
{ {
struct nci_hcp_message *message; const struct nci_hcp_message *message;
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
struct nci_data data; struct nci_data data;
int r; int r;
u8 *tmp; u8 *tmp;
...@@ -605,8 +605,8 @@ EXPORT_SYMBOL(nci_hci_set_param); ...@@ -605,8 +605,8 @@ EXPORT_SYMBOL(nci_hci_set_param);
int nci_hci_get_param(struct nci_dev *ndev, u8 gate, u8 idx, int nci_hci_get_param(struct nci_dev *ndev, u8 gate, u8 idx,
struct sk_buff **skb) struct sk_buff **skb)
{ {
struct nci_hcp_message *message; const struct nci_hcp_message *message;
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
struct nci_data data; struct nci_data data;
int r; int r;
u8 pipe = ndev->hci_dev->gate2pipe[gate]; u8 pipe = ndev->hci_dev->gate2pipe[gate];
...@@ -697,7 +697,7 @@ EXPORT_SYMBOL(nci_hci_connect_gate); ...@@ -697,7 +697,7 @@ EXPORT_SYMBOL(nci_hci_connect_gate);
static int nci_hci_dev_connect_gates(struct nci_dev *ndev, static int nci_hci_dev_connect_gates(struct nci_dev *ndev,
u8 gate_count, u8 gate_count,
struct nci_hci_gate *gates) const struct nci_hci_gate *gates)
{ {
int r; int r;
...@@ -714,7 +714,7 @@ static int nci_hci_dev_connect_gates(struct nci_dev *ndev, ...@@ -714,7 +714,7 @@ static int nci_hci_dev_connect_gates(struct nci_dev *ndev,
int nci_hci_dev_session_init(struct nci_dev *ndev) int nci_hci_dev_session_init(struct nci_dev *ndev)
{ {
struct nci_conn_info *conn_info; struct nci_conn_info *conn_info;
struct sk_buff *skb; struct sk_buff *skb;
int r; int r;
......
net/nfc/nci/ntf.c
View file @ 373a1f2b
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
/* Handle NCI Notification packets */ /* Handle NCI Notification packets */
static void nci_core_reset_ntf_packet(struct nci_dev *ndev, static void nci_core_reset_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
/* Handle NCI 2.x core reset notification */ /* Handle NCI 2.x core reset notification */
struct nci_core_reset_ntf *ntf = (void *)skb->data; const struct nci_core_reset_ntf *ntf = (void *)skb->data;
ndev->nci_ver = ntf->nci_ver; ndev->nci_ver = ntf->nci_ver;
pr_debug("nci_ver 0x%x, config_status 0x%x\n", pr_debug("nci_ver 0x%x, config_status 0x%x\n",
...@@ -48,7 +48,7 @@ static void nci_core_conn_credits_ntf_packet(struct nci_dev *ndev, ...@@ -48,7 +48,7 @@ static void nci_core_conn_credits_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct nci_core_conn_credit_ntf *ntf = (void *) skb->data; struct nci_core_conn_credit_ntf *ntf = (void *) skb->data;
struct nci_conn_info *conn_info; struct nci_conn_info *conn_info;
int i; int i;
pr_debug("num_entries %d\n", ntf->num_entries); pr_debug("num_entries %d\n", ntf->num_entries);
...@@ -80,7 +80,7 @@ static void nci_core_conn_credits_ntf_packet(struct nci_dev *ndev, ...@@ -80,7 +80,7 @@ static void nci_core_conn_credits_ntf_packet(struct nci_dev *ndev,
} }
static void nci_core_generic_error_ntf_packet(struct nci_dev *ndev, static void nci_core_generic_error_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
__u8 status = skb->data[0]; __u8 status = skb->data[0];
...@@ -107,9 +107,10 @@ static void nci_core_conn_intf_error_ntf_packet(struct nci_dev *ndev, ...@@ -107,9 +107,10 @@ static void nci_core_conn_intf_error_ntf_packet(struct nci_dev *ndev,
nci_data_exchange_complete(ndev, NULL, ntf->conn_id, -EIO); nci_data_exchange_complete(ndev, NULL, ntf->conn_id, -EIO);
} }
static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev, static const __u8 *
struct rf_tech_specific_params_nfca_poll *nfca_poll, nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev,
__u8 *data) struct rf_tech_specific_params_nfca_poll *nfca_poll,
const __u8 *data)
{ {
nfca_poll->sens_res = __le16_to_cpu(*((__le16 *)data)); nfca_poll->sens_res = __le16_to_cpu(*((__le16 *)data));
data += 2; data += 2;
...@@ -134,9 +135,10 @@ static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev, ...@@ -134,9 +135,10 @@ static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev,
return data; return data;
} }
static __u8 *nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev, static const __u8 *
struct rf_tech_specific_params_nfcb_poll *nfcb_poll, nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev,
__u8 *data) struct rf_tech_specific_params_nfcb_poll *nfcb_poll,
const __u8 *data)
{ {
nfcb_poll->sensb_res_len = min_t(__u8, *data++, NFC_SENSB_RES_MAXSIZE); nfcb_poll->sensb_res_len = min_t(__u8, *data++, NFC_SENSB_RES_MAXSIZE);
...@@ -148,9 +150,10 @@ static __u8 *nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev, ...@@ -148,9 +150,10 @@ static __u8 *nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev,
return data; return data;
} }
static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev, static const __u8 *
struct rf_tech_specific_params_nfcf_poll *nfcf_poll, nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev,
__u8 *data) struct rf_tech_specific_params_nfcf_poll *nfcf_poll,
const __u8 *data)
{ {
nfcf_poll->bit_rate = *data++; nfcf_poll->bit_rate = *data++;
nfcf_poll->sensf_res_len = min_t(__u8, *data++, NFC_SENSF_RES_MAXSIZE); nfcf_poll->sensf_res_len = min_t(__u8, *data++, NFC_SENSF_RES_MAXSIZE);
...@@ -164,9 +167,10 @@ static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev, ...@@ -164,9 +167,10 @@ static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev,
return data; return data;
} }
static __u8 *nci_extract_rf_params_nfcv_passive_poll(struct nci_dev *ndev, static const __u8 *
struct rf_tech_specific_params_nfcv_poll *nfcv_poll, nci_extract_rf_params_nfcv_passive_poll(struct nci_dev *ndev,
__u8 *data) struct rf_tech_specific_params_nfcv_poll *nfcv_poll,
const __u8 *data)
{ {
++data; ++data;
nfcv_poll->dsfid = *data++; nfcv_poll->dsfid = *data++;
...@@ -175,9 +179,10 @@ static __u8 *nci_extract_rf_params_nfcv_passive_poll(struct nci_dev *ndev, ...@@ -175,9 +179,10 @@ static __u8 *nci_extract_rf_params_nfcv_passive_poll(struct nci_dev *ndev,
return data; return data;
} }
static __u8 *nci_extract_rf_params_nfcf_passive_listen(struct nci_dev *ndev, static const __u8 *
struct rf_tech_specific_params_nfcf_listen *nfcf_listen, nci_extract_rf_params_nfcf_passive_listen(struct nci_dev *ndev,
__u8 *data) struct rf_tech_specific_params_nfcf_listen *nfcf_listen,
const __u8 *data)
{ {
nfcf_listen->local_nfcid2_len = min_t(__u8, *data++, nfcf_listen->local_nfcid2_len = min_t(__u8, *data++,
NFC_NFCID2_MAXSIZE); NFC_NFCID2_MAXSIZE);
...@@ -198,12 +203,12 @@ static int nci_add_new_protocol(struct nci_dev *ndev, ...@@ -198,12 +203,12 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
struct nfc_target *target, struct nfc_target *target,
__u8 rf_protocol, __u8 rf_protocol,
__u8 rf_tech_and_mode, __u8 rf_tech_and_mode,
void *params) const void *params)
{ {
struct rf_tech_specific_params_nfca_poll *nfca_poll; const struct rf_tech_specific_params_nfca_poll *nfca_poll;
struct rf_tech_specific_params_nfcb_poll *nfcb_poll; const struct rf_tech_specific_params_nfcb_poll *nfcb_poll;
struct rf_tech_specific_params_nfcf_poll *nfcf_poll; const struct rf_tech_specific_params_nfcf_poll *nfcf_poll;
struct rf_tech_specific_params_nfcv_poll *nfcv_poll; const struct rf_tech_specific_params_nfcv_poll *nfcv_poll;
__u32 protocol; __u32 protocol;
if (rf_protocol == NCI_RF_PROTOCOL_T1T) if (rf_protocol == NCI_RF_PROTOCOL_T1T)
...@@ -274,7 +279,7 @@ static int nci_add_new_protocol(struct nci_dev *ndev, ...@@ -274,7 +279,7 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
} }
static void nci_add_new_target(struct nci_dev *ndev, static void nci_add_new_target(struct nci_dev *ndev,
struct nci_rf_discover_ntf *ntf) const struct nci_rf_discover_ntf *ntf)
{ {
struct nfc_target *target; struct nfc_target *target;
int i, rc; int i, rc;
...@@ -319,10 +324,10 @@ void nci_clear_target_list(struct nci_dev *ndev) ...@@ -319,10 +324,10 @@ void nci_clear_target_list(struct nci_dev *ndev)
} }
static void nci_rf_discover_ntf_packet(struct nci_dev *ndev, static void nci_rf_discover_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
struct nci_rf_discover_ntf ntf; struct nci_rf_discover_ntf ntf;
__u8 *data = skb->data; const __u8 *data = skb->data;
bool add_target = true; bool add_target = true;
ntf.rf_discovery_id = *data++; ntf.rf_discovery_id = *data++;
...@@ -382,7 +387,8 @@ static void nci_rf_discover_ntf_packet(struct nci_dev *ndev, ...@@ -382,7 +387,8 @@ static void nci_rf_discover_ntf_packet(struct nci_dev *ndev,
} }
static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev, static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev,
struct nci_rf_intf_activated_ntf *ntf, __u8 *data) struct nci_rf_intf_activated_ntf *ntf,
const __u8 *data)
{ {
struct activation_params_nfca_poll_iso_dep *nfca_poll; struct activation_params_nfca_poll_iso_dep *nfca_poll;
struct activation_params_nfcb_poll_iso_dep *nfcb_poll; struct activation_params_nfcb_poll_iso_dep *nfcb_poll;
...@@ -418,7 +424,8 @@ static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev, ...@@ -418,7 +424,8 @@ static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev,
} }
static int nci_extract_activation_params_nfc_dep(struct nci_dev *ndev, static int nci_extract_activation_params_nfc_dep(struct nci_dev *ndev,
struct nci_rf_intf_activated_ntf *ntf, __u8 *data) struct nci_rf_intf_activated_ntf *ntf,
const __u8 *data)
{ {
struct activation_params_poll_nfc_dep *poll; struct activation_params_poll_nfc_dep *poll;
struct activation_params_listen_nfc_dep *listen; struct activation_params_listen_nfc_dep *listen;
...@@ -454,7 +461,7 @@ static int nci_extract_activation_params_nfc_dep(struct nci_dev *ndev, ...@@ -454,7 +461,7 @@ static int nci_extract_activation_params_nfc_dep(struct nci_dev *ndev,
} }
static void nci_target_auto_activated(struct nci_dev *ndev, static void nci_target_auto_activated(struct nci_dev *ndev,
struct nci_rf_intf_activated_ntf *ntf) const struct nci_rf_intf_activated_ntf *ntf)
{ {
struct nfc_target *target; struct nfc_target *target;
int rc; int rc;
...@@ -477,7 +484,7 @@ static void nci_target_auto_activated(struct nci_dev *ndev, ...@@ -477,7 +484,7 @@ static void nci_target_auto_activated(struct nci_dev *ndev,
} }
static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev, static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev,
struct nci_rf_intf_activated_ntf *ntf) const struct nci_rf_intf_activated_ntf *ntf)
{ {
ndev->remote_gb_len = 0; ndev->remote_gb_len = 0;
...@@ -519,11 +526,11 @@ static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev, ...@@ -519,11 +526,11 @@ static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev,
} }
static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev, static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
struct nci_conn_info *conn_info; struct nci_conn_info *conn_info;
struct nci_rf_intf_activated_ntf ntf; struct nci_rf_intf_activated_ntf ntf;
__u8 *data = skb->data; const __u8 *data = skb->data;
int err = NCI_STATUS_OK; int err = NCI_STATUS_OK;
ntf.rf_discovery_id = *data++; ntf.rf_discovery_id = *data++;
...@@ -681,10 +688,10 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev, ...@@ -681,10 +688,10 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
} }
static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev, static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
struct nci_conn_info *conn_info; const struct nci_conn_info *conn_info;
struct nci_rf_deactivate_ntf *ntf = (void *) skb->data; const struct nci_rf_deactivate_ntf *ntf = (void *)skb->data;
pr_debug("entry, type 0x%x, reason 0x%x\n", ntf->type, ntf->reason); pr_debug("entry, type 0x%x, reason 0x%x\n", ntf->type, ntf->reason);
...@@ -725,10 +732,10 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev, ...@@ -725,10 +732,10 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
} }
static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev, static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
u8 status = NCI_STATUS_OK; u8 status = NCI_STATUS_OK;
struct nci_nfcee_discover_ntf *nfcee_ntf = const struct nci_nfcee_discover_ntf *nfcee_ntf =
(struct nci_nfcee_discover_ntf *)skb->data; (struct nci_nfcee_discover_ntf *)skb->data;
pr_debug("\n"); pr_debug("\n");
...@@ -745,7 +752,7 @@ static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev, ...@@ -745,7 +752,7 @@ static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev,
} }
static void nci_nfcee_action_ntf_packet(struct nci_dev *ndev, static void nci_nfcee_action_ntf_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
pr_debug("\n"); pr_debug("\n");
} }
......
net/nfc/nci/rsp.c
View file @ 373a1f2b
...@@ -25,9 +25,10 @@ ...@@ -25,9 +25,10 @@
/* Handle NCI Response packets */ /* Handle NCI Response packets */
static void nci_core_reset_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) static void nci_core_reset_rsp_packet(struct nci_dev *ndev,
const struct sk_buff *skb)
{ {
struct nci_core_reset_rsp *rsp = (void *) skb->data; const struct nci_core_reset_rsp *rsp = (void *)skb->data;
pr_debug("status 0x%x\n", rsp->status); pr_debug("status 0x%x\n", rsp->status);
...@@ -43,10 +44,11 @@ static void nci_core_reset_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) ...@@ -43,10 +44,11 @@ static void nci_core_reset_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
} }
} }
static u8 nci_core_init_rsp_packet_v1(struct nci_dev *ndev, struct sk_buff *skb) static u8 nci_core_init_rsp_packet_v1(struct nci_dev *ndev,
const struct sk_buff *skb)
{ {
struct nci_core_init_rsp_1 *rsp_1 = (void *) skb->data; const struct nci_core_init_rsp_1 *rsp_1 = (void *)skb->data;
struct nci_core_init_rsp_2 *rsp_2; const struct nci_core_init_rsp_2 *rsp_2;
pr_debug("status 0x%x\n", rsp_1->status); pr_debug("status 0x%x\n", rsp_1->status);
...@@ -81,10 +83,11 @@ static u8 nci_core_init_rsp_packet_v1(struct nci_dev *ndev, struct sk_buff *skb) ...@@ -81,10 +83,11 @@ static u8 nci_core_init_rsp_packet_v1(struct nci_dev *ndev, struct sk_buff *skb)
return NCI_STATUS_OK; return NCI_STATUS_OK;
} }
static u8 nci_core_init_rsp_packet_v2(struct nci_dev *ndev, struct sk_buff *skb) static u8 nci_core_init_rsp_packet_v2(struct nci_dev *ndev,
const struct sk_buff *skb)
{ {
struct nci_core_init_rsp_nci_ver2 *rsp = (void *)skb->data; const struct nci_core_init_rsp_nci_ver2 *rsp = (void *)skb->data;
u8 *supported_rf_interface = rsp->supported_rf_interfaces; const u8 *supported_rf_interface = rsp->supported_rf_interfaces;
u8 rf_interface_idx = 0; u8 rf_interface_idx = 0;
u8 rf_extension_cnt = 0; u8 rf_extension_cnt = 0;
...@@ -118,7 +121,7 @@ static u8 nci_core_init_rsp_packet_v2(struct nci_dev *ndev, struct sk_buff *skb) ...@@ -118,7 +121,7 @@ static u8 nci_core_init_rsp_packet_v2(struct nci_dev *ndev, struct sk_buff *skb)
return NCI_STATUS_OK; return NCI_STATUS_OK;
} }
static void nci_core_init_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) static void nci_core_init_rsp_packet(struct nci_dev *ndev, const struct sk_buff *skb)
{ {
u8 status = 0; u8 status = 0;
...@@ -160,9 +163,9 @@ static void nci_core_init_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) ...@@ -160,9 +163,9 @@ static void nci_core_init_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
} }
static void nci_core_set_config_rsp_packet(struct nci_dev *ndev, static void nci_core_set_config_rsp_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
struct nci_core_set_config_rsp *rsp = (void *) skb->data; const struct nci_core_set_config_rsp *rsp = (void *)skb->data;
pr_debug("status 0x%x\n", rsp->status); pr_debug("status 0x%x\n", rsp->status);
...@@ -170,7 +173,7 @@ static void nci_core_set_config_rsp_packet(struct nci_dev *ndev, ...@@ -170,7 +173,7 @@ static void nci_core_set_config_rsp_packet(struct nci_dev *ndev,
} }
static void nci_rf_disc_map_rsp_packet(struct nci_dev *ndev, static void nci_rf_disc_map_rsp_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
__u8 status = skb->data[0]; __u8 status = skb->data[0];
...@@ -179,9 +182,10 @@ static void nci_rf_disc_map_rsp_packet(struct nci_dev *ndev, ...@@ -179,9 +182,10 @@ static void nci_rf_disc_map_rsp_packet(struct nci_dev *ndev,
nci_req_complete(ndev, status); nci_req_complete(ndev, status);
} }
static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) static void nci_rf_disc_rsp_packet(struct nci_dev *ndev,
const struct sk_buff *skb)
{ {
struct nci_conn_info *conn_info; struct nci_conn_info *conn_info;
__u8 status = skb->data[0]; __u8 status = skb->data[0];
pr_debug("status 0x%x\n", status); pr_debug("status 0x%x\n", status);
...@@ -210,7 +214,7 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) ...@@ -210,7 +214,7 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
} }
static void nci_rf_disc_select_rsp_packet(struct nci_dev *ndev, static void nci_rf_disc_select_rsp_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
__u8 status = skb->data[0]; __u8 status = skb->data[0];
...@@ -222,7 +226,7 @@ static void nci_rf_disc_select_rsp_packet(struct nci_dev *ndev, ...@@ -222,7 +226,7 @@ static void nci_rf_disc_select_rsp_packet(struct nci_dev *ndev,
} }
static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev, static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
__u8 status = skb->data[0]; __u8 status = skb->data[0];
...@@ -238,9 +242,9 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev, ...@@ -238,9 +242,9 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev,
} }
static void nci_nfcee_discover_rsp_packet(struct nci_dev *ndev, static void nci_nfcee_discover_rsp_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
struct nci_nfcee_discover_rsp *discover_rsp; const struct nci_nfcee_discover_rsp *discover_rsp;
if (skb->len != 2) { if (skb->len != 2) {
nci_req_complete(ndev, NCI_STATUS_NFCEE_PROTOCOL_ERROR); nci_req_complete(ndev, NCI_STATUS_NFCEE_PROTOCOL_ERROR);
...@@ -255,7 +259,7 @@ static void nci_nfcee_discover_rsp_packet(struct nci_dev *ndev, ...@@ -255,7 +259,7 @@ static void nci_nfcee_discover_rsp_packet(struct nci_dev *ndev,
} }
static void nci_nfcee_mode_set_rsp_packet(struct nci_dev *ndev, static void nci_nfcee_mode_set_rsp_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
__u8 status = skb->data[0]; __u8 status = skb->data[0];
...@@ -264,11 +268,11 @@ static void nci_nfcee_mode_set_rsp_packet(struct nci_dev *ndev, ...@@ -264,11 +268,11 @@ static void nci_nfcee_mode_set_rsp_packet(struct nci_dev *ndev,
} }
static void nci_core_conn_create_rsp_packet(struct nci_dev *ndev, static void nci_core_conn_create_rsp_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
__u8 status = skb->data[0]; __u8 status = skb->data[0];
struct nci_conn_info *conn_info = NULL; struct nci_conn_info *conn_info = NULL;
struct nci_core_conn_create_rsp *rsp; const struct nci_core_conn_create_rsp *rsp;
pr_debug("status 0x%x\n", status); pr_debug("status 0x%x\n", status);
...@@ -319,7 +323,7 @@ static void nci_core_conn_create_rsp_packet(struct nci_dev *ndev, ...@@ -319,7 +323,7 @@ static void nci_core_conn_create_rsp_packet(struct nci_dev *ndev,
} }
static void nci_core_conn_close_rsp_packet(struct nci_dev *ndev, static void nci_core_conn_close_rsp_packet(struct nci_dev *ndev,
struct sk_buff *skb) const struct sk_buff *skb)
{ {
struct nci_conn_info *conn_info; struct nci_conn_info *conn_info;
__u8 status = skb->data[0]; __u8 status = skb->data[0];
......
net/nfc/nci/spi.c
View file @ 373a1f2b
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#define CRC_INIT 0xFFFF #define CRC_INIT 0xFFFF
static int __nci_spi_send(struct nci_spi *nspi, struct sk_buff *skb, static int __nci_spi_send(struct nci_spi *nspi, const struct sk_buff *skb,
int cs_change) int cs_change)
{ {
struct spi_message m; struct spi_message m;
......
net/nfc/netlink.c
View file @ 373a1f2b
...@@ -530,7 +530,7 @@ int nfc_genl_se_transaction(struct nfc_dev *dev, u8 se_idx, ...@@ -530,7 +530,7 @@ int nfc_genl_se_transaction(struct nfc_dev *dev, u8 se_idx,
int nfc_genl_se_connectivity(struct nfc_dev *dev, u8 se_idx) int nfc_genl_se_connectivity(struct nfc_dev *dev, u8 se_idx)
{ {
struct nfc_se *se; const struct nfc_se *se;
struct sk_buff *msg; struct sk_buff *msg;
void *hdr; void *hdr;
......
net/nfc/nfc.h
View file @ 373a1f2b
...@@ -48,7 +48,7 @@ void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx, ...@@ -48,7 +48,7 @@ void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx,
u8 comm_mode, u8 rf_mode); u8 comm_mode, u8 rf_mode);
int nfc_llcp_register_device(struct nfc_dev *dev); int nfc_llcp_register_device(struct nfc_dev *dev);
void nfc_llcp_unregister_device(struct nfc_dev *dev); void nfc_llcp_unregister_device(struct nfc_dev *dev);
int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len); int nfc_llcp_set_remote_gb(struct nfc_dev *dev, const u8 *gb, u8 gb_len);
u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *general_bytes_len); u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *general_bytes_len);
int nfc_llcp_data_received(struct nfc_dev *dev, struct sk_buff *skb); int nfc_llcp_data_received(struct nfc_dev *dev, struct sk_buff *skb);
struct nfc_llcp_local *nfc_llcp_find_local(struct nfc_dev *dev); struct nfc_llcp_local *nfc_llcp_find_local(struct nfc_dev *dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7