diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-08 11:14:56 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-08 11:14:56 -0400 |
| commit | 61a3d4f9d52c00b2016bc27fc66b10a194043f76 (patch) | |
| tree | 938a7bd50bbef0215a20dfec99007b4c30828019 /include/net/bluetooth/hci_core.h | |
| parent | db906eb2101b0564b0c65edf4a8647395196342e (diff) | |
| parent | 1bd3fa7b8c9b2936c16c6e6452f9cc991c405872 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'include/net/bluetooth/hci_core.h')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 5f0b77b71b45..b0ded1333865 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
| @@ -464,6 +464,8 @@ struct hci_conn_params { | |||
| 464 | HCI_AUTO_CONN_ALWAYS, | 464 | HCI_AUTO_CONN_ALWAYS, |
| 465 | HCI_AUTO_CONN_LINK_LOSS, | 465 | HCI_AUTO_CONN_LINK_LOSS, |
| 466 | } auto_connect; | 466 | } auto_connect; |
| 467 | |||
| 468 | struct hci_conn *conn; | ||
| 467 | }; | 469 | }; |
| 468 | 470 | ||
| 469 | extern struct list_head hci_dev_list; | 471 | extern struct list_head hci_dev_list; |