aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-15 17:26:23 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-10-15 19:53:21 -0400
commite546099c3194ef6ecf46a8a50414005c29a46bc4 (patch)
tree5a8b04ec871e7aef1e1bc501a4b6d12fe363c538
parent3eb385289a8b71db40b1a4a4d739817bd437db4f (diff)
Bluetooth: Make mgmt_auth_failed() return void
The return value of mgmt_auth_failed() function is not used and so just change it to return void. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r--include/net/bluetooth/hci_core.h4
-rw-r--r--net/bluetooth/mgmt.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index aaa897f3b50a..c7427160c7c2 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1108,8 +1108,8 @@ int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
1108int mgmt_user_passkey_notify(struct hci_dev *hdev, bdaddr_t *bdaddr, 1108int mgmt_user_passkey_notify(struct hci_dev *hdev, bdaddr_t *bdaddr,
1109 u8 link_type, u8 addr_type, u32 passkey, 1109 u8 link_type, u8 addr_type, u32 passkey,
1110 u8 entered); 1110 u8 entered);
1111int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 1111void mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
1112 u8 addr_type, u8 status); 1112 u8 addr_type, u8 status);
1113int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status); 1113int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status);
1114int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); 1114int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status);
1115int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class, 1115int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index c959915d308e..3c4499041aeb 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4681,8 +4681,8 @@ int mgmt_user_passkey_notify(struct hci_dev *hdev, bdaddr_t *bdaddr,
4681 return mgmt_event(MGMT_EV_PASSKEY_NOTIFY, hdev, &ev, sizeof(ev), NULL); 4681 return mgmt_event(MGMT_EV_PASSKEY_NOTIFY, hdev, &ev, sizeof(ev), NULL);
4682} 4682}
4683 4683
4684int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 4684void mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
4685 u8 addr_type, u8 status) 4685 u8 addr_type, u8 status)
4686{ 4686{
4687 struct mgmt_ev_auth_failed ev; 4687 struct mgmt_ev_auth_failed ev;
4688 4688
@@ -4690,7 +4690,7 @@ int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
4690 ev.addr.type = link_to_bdaddr(link_type, addr_type); 4690 ev.addr.type = link_to_bdaddr(link_type, addr_type);
4691 ev.status = mgmt_status(status); 4691 ev.status = mgmt_status(status);
4692 4692
4693 return mgmt_event(MGMT_EV_AUTH_FAILED, hdev, &ev, sizeof(ev), NULL); 4693 mgmt_event(MGMT_EV_AUTH_FAILED, hdev, &ev, sizeof(ev), NULL);
4694} 4694}
4695 4695
4696int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status) 4696int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)