aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2011-01-10 07:28:45 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-02-07 22:40:06 -0500
commitd83506003608910d24d5ace9ec06ad1bfd9ad110 (patch)
tree1ef8935376c8134f143fbf34f16f491dc9d0b84d /net/bluetooth
parentb0916ea0d9e6ea3ed46bb7a61c13a2b357b0248b (diff)
Bluetooth: Remove page timeout setting from HCI init sequence
User space should set the page timeout so there's no need to explicitly set it in the HCI init sequence. Even if user space fails to set it the controller default value will be used. Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_core.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index cedb8a966df6..748f5a65caf4 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -254,10 +254,6 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt)
254 flt_type = HCI_FLT_CLEAR_ALL; 254 flt_type = HCI_FLT_CLEAR_ALL;
255 hci_send_cmd(hdev, HCI_OP_SET_EVENT_FLT, 1, &flt_type); 255 hci_send_cmd(hdev, HCI_OP_SET_EVENT_FLT, 1, &flt_type);
256 256
257 /* Page timeout ~20 secs */
258 param = cpu_to_le16(0x8000);
259 hci_send_cmd(hdev, HCI_OP_WRITE_PG_TIMEOUT, 2, &param);
260
261 /* Connection accept timeout ~20 secs */ 257 /* Connection accept timeout ~20 secs */
262 param = cpu_to_le16(0x7d00); 258 param = cpu_to_le16(0x7d00);
263 hci_send_cmd(hdev, HCI_OP_WRITE_CA_TIMEOUT, 2, &param); 259 hci_send_cmd(hdev, HCI_OP_WRITE_CA_TIMEOUT, 2, &param);