aboutsummaryrefslogtreecommitdiff
path: root/include/net/nfc
diff options
context:
space:
mode:
authorKrzysztof Kozlowski2021-07-24 23:47:33 +0200
committerDavid S. Miller2021-07-25 09:21:20 +0100
commitb9c28286d8f1822a10f702fcefe0b8a1db4e6917 (patch)
tree4220028d575e0cac82c578cd243e31947e8df0c3 /include/net/nfc
parent48d5440393d328cfe18b26e3609c84c0f41d6515 (diff)
nfc: constify nci_ops
The struct nci_ops is modified by NFC core in only one case: nci_allocate_device() receives too many proprietary commands (prop_ops) to configure. This is a build time known constrain, so a graceful handling of such case is not necessary. Instead, fail the nci_allocate_device() and add BUILD_BUG_ON() to places which set these. This allows to constify the struct nci_ops (consisting of function pointers) for correctness and safety. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/nfc')
-rw-r--r--include/net/nfc/nci_core.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index bf573eca07ca..5dae7e2cbc49 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -194,7 +194,7 @@ struct nci_hci_dev {
/* NCI Core structures */
struct nci_dev {
struct nfc_dev *nfc_dev;
- struct nci_ops *ops;
+ const struct nci_ops *ops;
struct nci_hci_dev *hci_dev;
int tx_headroom;
@@ -267,7 +267,7 @@ struct nci_dev {
};
/* ----- NCI Devices ----- */
-struct nci_dev *nci_allocate_device(struct nci_ops *ops,
+struct nci_dev *nci_allocate_device(const struct nci_ops *ops,
__u32 supported_protocols,
int tx_headroom,
int tx_tailroom);