diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-15 17:26:24 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-10-15 19:54:10 -0400 |
commit | 464996aea48aa1ec3d7d60098dbb0f7623da6c92 (patch) | |
tree | f004585fab7f23e7474e3d57f4a420e7fb10007b /net/bluetooth/mgmt.c | |
parent | e546099c3194ef6ecf46a8a50414005c29a46bc4 (diff) |
Bluetooth: Make mgmt_auth_enable_complete() return void
The return value of mgmt_auth_enable_complete() 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>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 3c4499041aeb..0672a8cb662e 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -4693,37 +4693,33 @@ void mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | |||
4693 | 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 | ||
4696 | int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status) | 4696 | void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status) |
4697 | { | 4697 | { |
4698 | struct cmd_lookup match = { NULL, hdev }; | 4698 | struct cmd_lookup match = { NULL, hdev }; |
4699 | bool changed = false; | 4699 | bool changed; |
4700 | int err = 0; | ||
4701 | 4700 | ||
4702 | if (status) { | 4701 | if (status) { |
4703 | u8 mgmt_err = mgmt_status(status); | 4702 | u8 mgmt_err = mgmt_status(status); |
4704 | mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, | 4703 | mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, |
4705 | cmd_status_rsp, &mgmt_err); | 4704 | cmd_status_rsp, &mgmt_err); |
4706 | return 0; | 4705 | return; |
4707 | } | 4706 | } |
4708 | 4707 | ||
4709 | if (test_bit(HCI_AUTH, &hdev->flags)) { | 4708 | if (test_bit(HCI_AUTH, &hdev->flags)) |
4710 | if (!test_and_set_bit(HCI_LINK_SECURITY, &hdev->dev_flags)) | 4709 | changed = !test_and_set_bit(HCI_LINK_SECURITY, |
4711 | changed = true; | 4710 | &hdev->dev_flags); |
4712 | } else { | 4711 | else |
4713 | if (test_and_clear_bit(HCI_LINK_SECURITY, &hdev->dev_flags)) | 4712 | changed = test_and_clear_bit(HCI_LINK_SECURITY, |
4714 | changed = true; | 4713 | &hdev->dev_flags); |
4715 | } | ||
4716 | 4714 | ||
4717 | mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, settings_rsp, | 4715 | mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, settings_rsp, |
4718 | &match); | 4716 | &match); |
4719 | 4717 | ||
4720 | if (changed) | 4718 | if (changed) |
4721 | err = new_settings(hdev, match.sk); | 4719 | new_settings(hdev, match.sk); |
4722 | 4720 | ||
4723 | if (match.sk) | 4721 | if (match.sk) |
4724 | sock_put(match.sk); | 4722 | sock_put(match.sk); |
4725 | |||
4726 | return err; | ||
4727 | } | 4723 | } |
4728 | 4724 | ||
4729 | static void clear_eir(struct hci_request *req) | 4725 | static void clear_eir(struct hci_request *req) |