Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 369000
b: refs/heads/master
c: 01178cd
h: refs/heads/master
v: v3
  • Loading branch information
Johan Hedberg authored and Gustavo Padovan committed Mar 8, 2013
1 parent f594f70 commit ff87121
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 24fd642ccb24c8b5732d7d7b5e98277507860b2a
refs/heads/master: 01178cd420e0134ef3fb4da161ba6390c66913bf
49 changes: 25 additions & 24 deletions trunk/net/bluetooth/hci_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ static void hci_req_cancel(struct hci_dev *hdev, int err)
}

/* Execute request and wait for completion. */
static int __hci_request(struct hci_dev *hdev,
void (*req)(struct hci_dev *hdev, unsigned long opt),
unsigned long opt, __u32 timeout)
static int __hci_req_sync(struct hci_dev *hdev,
void (*req)(struct hci_dev *hdev, unsigned long opt),
unsigned long opt, __u32 timeout)
{
DECLARE_WAITQUEUE(wait, current);
int err = 0;
Expand Down Expand Up @@ -150,9 +150,9 @@ static int __hci_request(struct hci_dev *hdev,
return err;
}

static int hci_request(struct hci_dev *hdev,
void (*req)(struct hci_dev *hdev, unsigned long opt),
unsigned long opt, __u32 timeout)
static int hci_req_sync(struct hci_dev *hdev,
void (*req)(struct hci_dev *hdev, unsigned long opt),
unsigned long opt, __u32 timeout)
{
int ret;

Expand All @@ -161,7 +161,7 @@ static int hci_request(struct hci_dev *hdev,

/* Serialize all requests */
hci_req_lock(hdev);
ret = __hci_request(hdev, req, opt, timeout);
ret = __hci_req_sync(hdev, req, opt, timeout);
hci_req_unlock(hdev);

return ret;
Expand Down Expand Up @@ -556,7 +556,8 @@ int hci_inquiry(void __user *arg)
timeo = ir.length * msecs_to_jiffies(2000);

if (do_inquiry) {
err = hci_request(hdev, hci_inq_req, (unsigned long)&ir, timeo);
err = hci_req_sync(hdev, hci_inq_req, (unsigned long) &ir,
timeo);
if (err < 0)
goto done;
}
Expand Down Expand Up @@ -737,7 +738,7 @@ int hci_dev_open(__u16 dev)
set_bit(HCI_INIT, &hdev->flags);
hdev->init_last_cmd = 0;

ret = __hci_request(hdev, hci_init_req, 0, HCI_INIT_TIMEOUT);
ret = __hci_req_sync(hdev, hci_init_req, 0, HCI_INIT_TIMEOUT);

clear_bit(HCI_INIT, &hdev->flags);
}
Expand Down Expand Up @@ -828,7 +829,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
if (!test_bit(HCI_RAW, &hdev->flags) &&
test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) {
set_bit(HCI_INIT, &hdev->flags);
__hci_request(hdev, hci_reset_req, 0, HCI_CMD_TIMEOUT);
__hci_req_sync(hdev, hci_reset_req, 0, HCI_CMD_TIMEOUT);
clear_bit(HCI_INIT, &hdev->flags);
}

Expand Down Expand Up @@ -921,7 +922,7 @@ int hci_dev_reset(__u16 dev)
hdev->acl_cnt = 0; hdev->sco_cnt = 0; hdev->le_cnt = 0;

if (!test_bit(HCI_RAW, &hdev->flags))
ret = __hci_request(hdev, hci_reset_req, 0, HCI_INIT_TIMEOUT);
ret = __hci_req_sync(hdev, hci_reset_req, 0, HCI_INIT_TIMEOUT);

done:
hci_req_unlock(hdev);
Expand Down Expand Up @@ -960,8 +961,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)

switch (cmd) {
case HCISETAUTH:
err = hci_request(hdev, hci_auth_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
err = hci_req_sync(hdev, hci_auth_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
break;

case HCISETENCRYPT:
Expand All @@ -972,24 +973,24 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)

if (!test_bit(HCI_AUTH, &hdev->flags)) {
/* Auth must be enabled first */
err = hci_request(hdev, hci_auth_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
err = hci_req_sync(hdev, hci_auth_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
if (err)
break;
}

err = hci_request(hdev, hci_encrypt_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
err = hci_req_sync(hdev, hci_encrypt_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
break;

case HCISETSCAN:
err = hci_request(hdev, hci_scan_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
err = hci_req_sync(hdev, hci_scan_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
break;

case HCISETLINKPOL:
err = hci_request(hdev, hci_linkpol_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
err = hci_req_sync(hdev, hci_linkpol_req, dr.dev_opt,
HCI_INIT_TIMEOUT);
break;

case HCISETLINKMODE:
Expand Down Expand Up @@ -1608,10 +1609,10 @@ static int hci_do_le_scan(struct hci_dev *hdev, u8 type, u16 interval,

hci_req_lock(hdev);

err = __hci_request(hdev, le_scan_param_req, (unsigned long) &param,
timeo);
err = __hci_req_sync(hdev, le_scan_param_req, (unsigned long) &param,
timeo);
if (!err)
err = __hci_request(hdev, le_scan_enable_req, 0, timeo);
err = __hci_req_sync(hdev, le_scan_enable_req, 0, timeo);

hci_req_unlock(hdev);

Expand Down

0 comments on commit ff87121

Please sign in to comment.