[PATCH v2 07/16] Bluetooth: Create cancel_inquiry()
From: Andre Guedes <hidden>
Date: 2011-07-25 19:49:56
Subsystem:
bluetooth subsystem, the rest · Maintainers:
Marcel Holtmann, Luiz Augusto von Dentz, Linus Torvalds
This patch moves all cancel inquiry code from stop_discovery() to a new function called cancel_inquiry(). Signed-off-by: Andre Guedes <redacted> --- net/bluetooth/mgmt.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 7ea8f95..e43940e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c@@ -1665,6 +1665,11 @@ failed: return err; } +static int cancel_inquiry(struct hci_dev *hdev) +{ + return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL); +} + static int stop_discovery(struct sock *sk, u16 index) { struct hci_dev *hdev;
@@ -1696,7 +1701,7 @@ static int stop_discovery(struct sock *sk, u16 index) goto failed; } - err = hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL); + err = cancel_inquiry(hdev); if (err < 0) mgmt_pending_remove(cmd);
--
1.7.4.1