Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Bluetooth: hci_sync: Fix hci_update_accept_list_sync" #136

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions net/bluetooth/hci_sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -1841,7 +1841,6 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
struct bdaddr_list *b, *t;
u8 num_entries = 0;
bool pend_conn, pend_report;
u8 filter_policy;
int err;

/* Pause advertising if resolving list can be used as controllers are
Expand Down Expand Up @@ -1928,8 +1927,6 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
err = -EINVAL;

done:
filter_policy = err ? 0x00 : 0x01;

/* Enable address resolution when LL Privacy is enabled. */
err = hci_le_set_addr_resolution_enable_sync(hdev, 0x01);
if (err)
Expand All @@ -1940,7 +1937,7 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
hci_resume_advertising_sync(hdev);

/* Select filter policy to use accept list */
return filter_policy;
return err ? 0x00 : 0x01;
}

/* Returns true if an le connection is in the scanning state */
Expand Down