diff options
author | David S. Miller <davem@davemloft.net> | 2012-09-30 02:30:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-30 02:30:16 -0400 |
commit | a248afdc1b5916c2bfd007233112333d85aa28f6 (patch) | |
tree | 49d4a0b8fdcf7624ea6b0bdf0af2567d7392210e /net/bluetooth/hci_core.c | |
parent | d379142bc4d9b78cdd9fc5aa696ca1ea083fb7d4 (diff) | |
parent | c487606f835a93a725bac1aefd536be98f22474d (diff) |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
Here is another batch of updates intended for 3.7...
Highlights include an hci_connect re-write in Bluetooth, HCI/LLC
layer separation in NFC, removal of the raw pn544 NFC driver, NFC LLCP
raw sockets support, improved IBSS auth frame handling in mac80211,
full-MAC AP mode notification support in mac80211, a lot of attention
paid to brcmfmac, and the usual level of updates to iwlwifi, ath9k,
mwifiex, and rt2x00, and various other updates.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r-- | net/bluetooth/hci_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 8806869ad4d6..8a0ce706aebd 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -231,6 +231,9 @@ static void amp_init(struct hci_dev *hdev) | |||
231 | 231 | ||
232 | /* Read Local AMP Info */ | 232 | /* Read Local AMP Info */ |
233 | hci_send_cmd(hdev, HCI_OP_READ_LOCAL_AMP_INFO, 0, NULL); | 233 | hci_send_cmd(hdev, HCI_OP_READ_LOCAL_AMP_INFO, 0, NULL); |
234 | |||
235 | /* Read Data Blk size */ | ||
236 | hci_send_cmd(hdev, HCI_OP_READ_DATA_BLOCK_SIZE, 0, NULL); | ||
234 | } | 237 | } |
235 | 238 | ||
236 | static void hci_init_req(struct hci_dev *hdev, unsigned long opt) | 239 | static void hci_init_req(struct hci_dev *hdev, unsigned long opt) |
@@ -268,7 +271,6 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt) | |||
268 | BT_ERR("Unknown device type %d", hdev->dev_type); | 271 | BT_ERR("Unknown device type %d", hdev->dev_type); |
269 | break; | 272 | break; |
270 | } | 273 | } |
271 | |||
272 | } | 274 | } |
273 | 275 | ||
274 | static void hci_le_init_req(struct hci_dev *hdev, unsigned long opt) | 276 | static void hci_le_init_req(struct hci_dev *hdev, unsigned long opt) |
@@ -1654,6 +1656,7 @@ struct hci_dev *hci_alloc_dev(void) | |||
1654 | INIT_LIST_HEAD(&hdev->link_keys); | 1656 | INIT_LIST_HEAD(&hdev->link_keys); |
1655 | INIT_LIST_HEAD(&hdev->long_term_keys); | 1657 | INIT_LIST_HEAD(&hdev->long_term_keys); |
1656 | INIT_LIST_HEAD(&hdev->remote_oob_data); | 1658 | INIT_LIST_HEAD(&hdev->remote_oob_data); |
1659 | INIT_LIST_HEAD(&hdev->conn_hash.list); | ||
1657 | 1660 | ||
1658 | INIT_WORK(&hdev->rx_work, hci_rx_work); | 1661 | INIT_WORK(&hdev->rx_work, hci_rx_work); |
1659 | INIT_WORK(&hdev->cmd_work, hci_cmd_work); | 1662 | INIT_WORK(&hdev->cmd_work, hci_cmd_work); |
@@ -1676,7 +1679,6 @@ struct hci_dev *hci_alloc_dev(void) | |||
1676 | 1679 | ||
1677 | hci_init_sysfs(hdev); | 1680 | hci_init_sysfs(hdev); |
1678 | discovery_init(hdev); | 1681 | discovery_init(hdev); |
1679 | hci_conn_hash_init(hdev); | ||
1680 | 1682 | ||
1681 | return hdev; | 1683 | return hdev; |
1682 | } | 1684 | } |