Attachment #908349 for bug #942925

Lines 3755-3760 static void hci_acldata_packet(struct hci_dev hdev, struct sk_buff skb) Link Here

(-)a/net/bluetooth/hci_core.c (+2 lines)
3755		3755
3756	hci_dev_lock(hdev);	3756	hci_dev_lock(hdev);
3757	conn = hci_conn_hash_lookup_handle(hdev, handle);	3757	conn = hci_conn_hash_lookup_handle(hdev, handle);
		3758	if (conn && hci_dev_test_flag(hdev, HCI_MGMT))
		3759	mgmt_device_connected(hdev, conn, NULL, 0);
3758	hci_dev_unlock(hdev);	3760	hci_dev_unlock(hdev);
3759		3761
3760	if (conn) {	3762	if (conn) {

Lines 3707-3713 static void hci_remote_features_evt(struct hci_dev hdev, void data, Link Here

(-)a/net/bluetooth/hci_event.c (-1 / +1 lines)
3707	goto unlock;	3707	goto unlock;
3708	}	3708	}
3709		3709
3710	if (!ev->status && !test_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) {	3710	if (!ev->status) {
3711	struct hci_cp_remote_name_req cp;	3711	struct hci_cp_remote_name_req cp;
3712	memset(&cp, 0, sizeof(cp));	3712	memset(&cp, 0, sizeof(cp));
3713	bacpy(&cp.bdaddr, &conn->dst);	3713	bacpy(&cp.bdaddr, &conn->dst);




static int l2cap_connect_req(struct l2cap_conn *conn,
			     struct l2cap_cmd_hdr *cmd, u16 cmd_len, u8 *data)
{
	struct hci_dev *hdev = conn->hcon->hdev;
	struct hci_conn *hcon = conn->hcon;

	if (cmd_len < sizeof(struct l2cap_conn_req))
		return -EPROTO;

	hci_dev_lock(hdev);
	if (hci_dev_test_flag(hdev, HCI_MGMT))
		mgmt_device_connected(hdev, hcon, NULL, 0);
	hci_dev_unlock(hdev);

	l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP);
	return 0;
}
- 

Return to bug 942925

Lines 4064-4080 static void l2cap_connect(struct l2cap_conn conn, struct l2cap_cmd_hdr cmd, Link Here

(-)a/net/bluetooth/l2cap_core.c (-9 lines)
4064	static int l2cap_connect_req(struct l2cap_conn *conn,	4064	static int l2cap_connect_req(struct l2cap_conn *conn,
4065	struct l2cap_cmd_hdr cmd, u16 cmd_len, u8 data)	4065	struct l2cap_cmd_hdr cmd, u16 cmd_len, u8 data)
4066	{	4066	{
4067	struct hci_dev *hdev = conn->hcon->hdev;
4068	struct hci_conn *hcon = conn->hcon;
4069
4070	if (cmd_len < sizeof(struct l2cap_conn_req))	4067	if (cmd_len < sizeof(struct l2cap_conn_req))
4071	return -EPROTO;	4068	return -EPROTO;
4072		4069
4073	hci_dev_lock(hdev);
4074	if (hci_dev_test_flag(hdev, HCI_MGMT))
4075	mgmt_device_connected(hdev, hcon, NULL, 0);
4076	hci_dev_unlock(hdev);
4077
4078	l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP);	4070	l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP);
4079	return 0;	4071	return 0;
4080	}	4072	}
4081	-