forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
John W. Linville 2014-09-08 11:14:56 -04:00
commit 61a3d4f9d5
25 changed files with 86 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/net/bluetooth/hci_core.h
View file

@ -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;