Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 291024
b: refs/heads/master
c: 6bf0e46
h: refs/heads/master
v: v3
  • Loading branch information
Andrei Emeltchenko authored and Johan Hedberg committed Feb 23, 2012
1 parent 85177c9 commit 102730c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 70c1f20b00495fd25b81be14b263d32648a3d629
refs/heads/master: 6bf0e4699d1dd56f7f8c12cf332ebffaf1c5e83e
8 changes: 4 additions & 4 deletions trunk/net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -952,9 +952,9 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len)
if (!!cp->val != test_bit(HCI_CONNECTABLE, &hdev->dev_flags))
changed = true;

if (cp->val)
if (cp->val) {
set_bit(HCI_CONNECTABLE, &hdev->dev_flags);
else {
} else {
clear_bit(HCI_CONNECTABLE, &hdev->dev_flags);
clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
}
Expand Down Expand Up @@ -987,9 +987,9 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len)
goto failed;
}

if (cp->val)
if (cp->val) {
scan = SCAN_PAGE;
else {
} else {
scan = 0;

if (test_bit(HCI_ISCAN, &hdev->flags) &&
Expand Down

0 comments on commit 102730c

Please sign in to comment.