DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: Move Discovery timers to hci_dev struct" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2011-12-06 11:36:58 -08:00
committed by QuIC Gerrit Code Review
parent 042f0e0b04 6e349d0a90
commit 47dece1c78
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/bluetooth/hci_core.h
View File

@@ -240,6 +240,9 @@ struct hci_dev {
rwlock_t adv_entries_lock; rwlock_t adv_entries_lock;
struct timer_list adv_timer; struct timer_list adv_timer;
struct timer_list disc_timer;
struct timer_list disc_le_timer;
struct hci_dev_stats stat; struct hci_dev_stats stat;
struct sk_buff_head driver_init; struct sk_buff_head driver_init;

44
net/bluetooth/mgmt.c
View File

@@ -41,8 +41,6 @@ enum scan_mode {
}; };
struct disco_interleave { struct disco_interleave {
struct timer_list timer;
struct timer_list le_timer;
u16 index; u16 index;
enum scan_mode mode; enum scan_mode mode;
int int_phase; int int_phase;
@@ -1565,12 +1563,19 @@ static void pairing_connect_complete_cb(struct hci_conn *conn, u8 status)
static void discovery_terminated(struct pending_cmd *cmd, void *data) static void discovery_terminated(struct pending_cmd *cmd, void *data)
{ {
struct hci_dev *hdev;
struct mgmt_mode ev = {0}; struct mgmt_mode ev = {0};
struct disco_interleave *ilp = cmd->param;
BT_DBG(""); BT_DBG("");
del_timer_sync(&ilp->le_timer); hdev = hci_dev_get(cmd->index);
del_timer_sync(&ilp->timer); if (!hdev)
goto not_found;
del_timer_sync(&hdev->disc_le_timer);
del_timer_sync(&hdev->disc_timer);
hci_dev_put(hdev);
not_found:
mgmt_event(MGMT_EV_DISCOVERING, cmd->index, &ev, sizeof(ev), NULL); mgmt_event(MGMT_EV_DISCOVERING, cmd->index, &ev, sizeof(ev), NULL);
list_del(&cmd->list); list_del(&cmd->list);
@@ -1851,10 +1856,12 @@ static void discovery_rsp(struct pending_cmd *cmd, void *data)
cmd_complete(cmd->sk, cmd->index, MGMT_OP_STOP_DISCOVERY, cmd_complete(cmd->sk, cmd->index, MGMT_OP_STOP_DISCOVERY,
NULL, 0); NULL, 0);
if (cmd->opcode == MGMT_OP_STOP_DISCOVERY) { if (cmd->opcode == MGMT_OP_STOP_DISCOVERY) {
struct disco_interleave *ilp = cmd->param; struct hci_dev *hdev = hci_dev_get(cmd->index);
if (hdev) {
del_timer_sync(&ilp->le_timer); del_timer_sync(&hdev->disc_le_timer);
del_timer_sync(&ilp->timer); del_timer_sync(&hdev->disc_timer);
hci_dev_put(hdev);
}
} }
} }
@@ -1903,8 +1910,8 @@ void mgmt_inquiry_complete_evt(u16 index, u8 status)
err = hci_send_cmd(hdev, HCI_OP_LE_SET_SCAN_ENABLE, err = hci_send_cmd(hdev, HCI_OP_LE_SET_SCAN_ENABLE,
sizeof(le_cp), &le_cp); sizeof(le_cp), &le_cp);
if (err >= 0) { if (err >= 0 && hdev) {
mod_timer(&ilp->le_timer, jiffies + mod_timer(&hdev->disc_le_timer, jiffies +
msecs_to_jiffies(ilp->int_phase * 1000)); msecs_to_jiffies(ilp->int_phase * 1000));
ilp->mode = SCAN_LE; ilp->mode = SCAN_LE;
} else } else
@@ -1927,11 +1934,11 @@ static void disco_to(unsigned long data)
BT_DBG("hci%d", ilp->index); BT_DBG("hci%d", ilp->index);
del_timer_sync(&ilp->le_timer);
hdev = hci_dev_get(ilp->index); hdev = hci_dev_get(ilp->index);
if (hdev) { if (hdev) {
hci_dev_lock_bh(hdev); hci_dev_lock_bh(hdev);
del_timer_sync(&hdev->disc_le_timer);
cmd = mgmt_pending_find(MGMT_OP_STOP_DISCOVERY, ilp->index); cmd = mgmt_pending_find(MGMT_OP_STOP_DISCOVERY, ilp->index);
@@ -2056,10 +2063,11 @@ static int start_discovery(struct sock *sk, u16 index)
cmd = mgmt_pending_find(MGMT_OP_STOP_DISCOVERY, index); cmd = mgmt_pending_find(MGMT_OP_STOP_DISCOVERY, index);
if (cmd) { if (cmd) {
ilp = cmd->param; ilp = cmd->param;
setup_timer(&ilp->le_timer, disco_le_to, setup_timer(&hdev->disc_le_timer, disco_le_to,
(unsigned long) ilp); (unsigned long) ilp);
setup_timer(&ilp->timer, disco_to, (unsigned long) ilp); setup_timer(&hdev->disc_timer, disco_to,
mod_timer(&ilp->timer, (unsigned long) ilp);
mod_timer(&hdev->disc_timer,
jiffies + msecs_to_jiffies(20000)); jiffies + msecs_to_jiffies(20000));
} }
} }
@@ -2110,8 +2118,8 @@ static int stop_discovery(struct sock *sk, u16 index)
if (ilp) { if (ilp) {
ilp->mode = SCAN_IDLE; ilp->mode = SCAN_IDLE;
del_timer_sync(&ilp->le_timer); del_timer_sync(&hdev->disc_le_timer);
del_timer_sync(&ilp->timer); del_timer_sync(&hdev->disc_timer);
} }
if (err < 0 && cmd) if (err < 0 && cmd)
@@ -2859,7 +2867,7 @@ int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 type, u8 le,
hci_send_cmd(hdev, HCI_OP_INQUIRY, hci_send_cmd(hdev, HCI_OP_INQUIRY,
sizeof(cp), &cp); sizeof(cp), &cp);
ilp->mode = SCAN_BR; ilp->mode = SCAN_BR;
del_timer_sync(&ilp->le_timer); del_timer_sync(&hdev->disc_le_timer);
} }
} }