lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

Browse Source 
Conflicts:
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
This commit is contained in:
Gustavo F. Padovan
2011-04-20 21:47:07 -03:00
parent 26954c7f26 069f40fc07
commit 828d7d7b19
90 changed files with 803 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/bluetooth/hci_event.c
View File

@@ -2419,8 +2419,6 @@ static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *s
if (!conn)
goto unlock;
hci_conn_hold(conn);
conn->remote_cap = ev->capability;
conn->remote_oob = ev->oob_data;
conn->remote_auth = ev->authentication;