Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2014-09-08 11:14:56 -04:00
parent db906eb210 1bd3fa7b8c
commit 61a3d4f9d5
25 changed files with 86 additions and 38 deletions
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -464,6 +464,8 @@ struct hci_conn_params {
 		HCI_AUTO_CONN_ALWAYS,
 		HCI_AUTO_CONN_LINK_LOSS,
 	} auto_connect;
+
+	struct hci_conn *conn;
 };

 extern struct list_head hci_dev_list;