Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2de21e58 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
parents 67b3bd4e e8b1ab9e

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static void bluecard_release(struct pcmcia_device *link) 


	bluecard_close(info);



	del_timer(&(info->timer));

	del_timer_sync(&(info->timer));



	pcmcia_disable_device(link);

}

drivers/bluetooth/btmrvl_main.c

+6 −5
Original line number Diff line number Diff line
@@ -59,14 +59,15 @@ bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb) 
			priv->btmrvl_dev.sendcmdflag = false;

			priv->adapter->cmd_complete = true;

			wake_up_interruptible(&priv->adapter->cmd_wait_q);

		}



			if (hci_opcode_ogf(opcode) == 0x3F) {

			BT_DBG("vendor event skipped: opcode=%#4.4x", opcode);

				BT_DBG("vendor event skipped: opcode=%#4.4x",

				       opcode);

				kfree_skb(skb);

				return false;

			}

		}

	}



	return true;

}

include/net/bluetooth/hci_core.h

+2 −1
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ struct hci_dev { 
	__u16		page_scan_window;

	__u8		page_scan_type;

	__u8		le_adv_channel_map;

	__u8		le_scan_type;

	__u16		le_scan_interval;

	__u16		le_scan_window;

	__u16		le_conn_min_interval;
@@ -1236,7 +1237,7 @@ void mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, 
void mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

				      u8 status);

int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,

			      u8 link_type, u8 addr_type, __le32 value,

			      u8 link_type, u8 addr_type, u32 value,

			      u8 confirm_hint);

int mgmt_user_confirm_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

				     u8 link_type, u8 addr_type, u8 status);

net/bluetooth/hci_event.c

+61 −2
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 
	memset(hdev->scan_rsp_data, 0, sizeof(hdev->scan_rsp_data));

	hdev->scan_rsp_data_len = 0;



	hdev->le_scan_type = LE_SCAN_PASSIVE;



	hdev->ssp_debug_mode = 0;

}
@@ -997,6 +999,25 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb) 
	hci_dev_unlock(hdev);

}



static void hci_cc_le_set_scan_param(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_cp_le_set_scan_param *cp;

	__u8 status = *((__u8 *) skb->data);



	BT_DBG("%s status 0x%2.2x", hdev->name, status);



	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_SCAN_PARAM);

	if (!cp)

		return;



	hci_dev_lock(hdev);



	if (!status)

		hdev->le_scan_type = cp->type;



	hci_dev_unlock(hdev);

}



static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,

				      struct sk_buff *skb)

{
@@ -1704,6 +1725,36 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, u8 status) 
	hci_dev_unlock(hdev);

}



static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)

{

	struct hci_cp_le_start_enc *cp;

	struct hci_conn *conn;



	BT_DBG("%s status 0x%2.2x", hdev->name, status);



	if (!status)

		return;



	hci_dev_lock(hdev);



	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_START_ENC);

	if (!cp)

		goto unlock;



	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));

	if (!conn)

		goto unlock;



	if (conn->state != BT_CONNECTED)

		goto unlock;



	hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);

	hci_conn_drop(conn);



unlock:

	hci_dev_unlock(hdev);

}



static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

{

	__u8 status = *((__u8 *) skb->data);
@@ -2488,6 +2539,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		hci_cc_le_set_adv_enable(hdev, skb);

		break;



	case HCI_OP_LE_SET_SCAN_PARAM:

		hci_cc_le_set_scan_param(hdev, skb);

		break;



	case HCI_OP_LE_SET_SCAN_ENABLE:

		hci_cc_le_set_scan_enable(hdev, skb);

		break;
@@ -2611,6 +2666,10 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		hci_cs_le_create_conn(hdev, ev->status);

		break;



	case HCI_OP_LE_START_ENC:

		hci_cs_le_start_enc(hdev, ev->status);

		break;



	default:

		BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode);

		break;
@@ -3459,8 +3518,8 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev, 
	}



confirm:

	mgmt_user_confirm_request(hdev, &ev->bdaddr, ACL_LINK, 0, ev->passkey,

				  confirm_hint);

	mgmt_user_confirm_request(hdev, &ev->bdaddr, ACL_LINK, 0,

				  le32_to_cpu(ev->passkey), confirm_hint);



unlock:

	hci_dev_unlock(hdev);

net/bluetooth/l2cap_sock.c

+2 −1
Original line number Diff line number Diff line
@@ -360,7 +360,8 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr, 


	BT_DBG("sock %p, sk %p", sock, sk);



	if (peer && sk->sk_state != BT_CONNECTED)

	if (peer && sk->sk_state != BT_CONNECTED &&

	    sk->sk_state != BT_CONNECT && sk->sk_state != BT_CONNECT2)

		return -ENOTCONN;



	memset(la, 0, sizeof(struct sockaddr_l2));