From: Sasha Levin <sashal@kernel.org>
Date: Sat, 21 Sep 2019 19:23:46 +0000 (-0400)
Subject: fixes for 4.4
X-Git-Tag: v5.3.2~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fefbb546108f850a28a42dfcfdca4e7a59e7f4f;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 4.4

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.4/revert-bluetooth-validate-ble-connection-interval-up.patch b/queue-4.4/revert-bluetooth-validate-ble-connection-interval-up.patch
new file mode 100644
index 00000000000..96aca067caa
--- /dev/null
+++ b/queue-4.4/revert-bluetooth-validate-ble-connection-interval-up.patch
@@ -0,0 +1,62 @@
+From 6e110044c595dd1d46641caf8528f306e9c5e88f Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 4 Sep 2019 20:13:08 +0200
+Subject: Revert "Bluetooth: validate BLE connection interval updates"
+
+From: Marcel Holtmann <marcel@holtmann.org>
+
+[ Upstream commit 68d19d7d995759b96169da5aac313363f92a9075 ]
+
+This reverts commit c49a8682fc5d298d44e8d911f4fa14690ea9485e.
+
+There are devices which require low connection intervals for usable operation
+including keyboards and mice. Forcing a static connection interval for
+these types of devices has an impact in latency and causes a regression.
+
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ net/bluetooth/hci_event.c  | 5 -----
+ net/bluetooth/l2cap_core.c | 9 +--------
+ 2 files changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
+index c4e94f34d0480..37fe2b158c2a7 100644
+--- a/net/bluetooth/hci_event.c
++++ b/net/bluetooth/hci_event.c
+@@ -5062,11 +5062,6 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,
+ 		return send_conn_param_neg_reply(hdev, handle,
+ 						 HCI_ERROR_UNKNOWN_CONN_ID);
+ 
+-	if (min < hcon->le_conn_min_interval ||
+-	    max > hcon->le_conn_max_interval)
+-		return send_conn_param_neg_reply(hdev, handle,
+-						 HCI_ERROR_INVALID_LL_PARAMS);
+-
+ 	if (hci_check_conn_params(min, max, latency, timeout))
+ 		return send_conn_param_neg_reply(hdev, handle,
+ 						 HCI_ERROR_INVALID_LL_PARAMS);
+diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
+index 8cfba78d26f61..c25f1e4846cde 100644
+--- a/net/bluetooth/l2cap_core.c
++++ b/net/bluetooth/l2cap_core.c
+@@ -5266,14 +5266,7 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,
+ 
+ 	memset(&rsp, 0, sizeof(rsp));
+ 
+-	if (min < hcon->le_conn_min_interval ||
+-	    max > hcon->le_conn_max_interval) {
+-		BT_DBG("requested connection interval exceeds current bounds.");
+-		err = -EINVAL;
+-	} else {
+-		err = hci_check_conn_params(min, max, latency, to_multiplier);
+-	}
+-
++	err = hci_check_conn_params(min, max, latency, to_multiplier);
+ 	if (err)
+ 		rsp.result = cpu_to_le16(L2CAP_CONN_PARAM_REJECTED);
+ 	else
+-- 
+2.20.1
+
diff --git a/queue-4.4/series b/queue-4.4/series
new file mode 100644
index 00000000000..13deb4519d2
--- /dev/null
+++ b/queue-4.4/series
@@ -0,0 +1 @@
+revert-bluetooth-validate-ble-connection-interval-up.patch