diff --git a/config/kernel/linux-media-current.config b/config/kernel/linux-media-current.config index f34f0ea8f..c2786e6f1 100644 --- a/config/kernel/linux-media-current.config +++ b/config/kernel/linux-media-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.12 Kernel Configuration +# Linux/arm64 5.15.15 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y diff --git a/patch/kernel/archive/rk322x-5.15/bt-0001-add-new-quirk-for-broken-local-ext-feature.patch b/patch/kernel/archive/rk322x-5.15/bt-0001-add-new-quirk-for-broken-local-ext-feature.patch index 662a263a6..a4614e12b 100644 --- a/patch/kernel/archive/rk322x-5.15/bt-0001-add-new-quirk-for-broken-local-ext-feature.patch +++ b/patch/kernel/archive/rk322x-5.15/bt-0001-add-new-quirk-for-broken-local-ext-feature.patch @@ -1,8 +1,7 @@ -From b3509370bbff7edd3fb7399e08f3ac8030067f05 Mon Sep 17 00:00:00 2001 -From: Vasily Khoruzhick +From f60f1605f5056d543e49fc625ffeeb05621f2ad3 Mon Sep 17 00:00:00 2001 +From: Vasily Khoruzhick Date: Wed, 31 Oct 2018 19:40:18 -0700 -Subject: [PATCH 299/467] Bluetooth: Add new quirk for broken local ext - features max_page +Subject: Bluetooth: Add new quirk for broken local ext features max_page Some adapters (e.g. RTL8723CS) advertise that they have more than 2 pages for local ext features, but they don't support any features @@ -17,10 +16,10 @@ Signed-off-by: Vasily Khoruzhick 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h -index b80415011..715577a60 100644 +index 16ab6ce87883..8e4c16210d18 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h -@@ -246,6 +246,13 @@ enum { +@@ -238,6 +238,13 @@ enum { * HCI after resume. */ HCI_QUIRK_NO_SUSPEND_NOTIFIER, @@ -31,14 +30,14 @@ index b80415011..715577a60 100644 + * don't actually support features declared there. + */ + HCI_QUIRK_BROKEN_LOCAL_EXT_FTR_MAX_PAGE, - }; - /* HCI device flags */ + /* + * When this quirk is set, LE tx power is not queried on startup diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c -index 0bca035bf..095889890 100644 +index cfeaee347db3..df3232828978 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c -@@ -725,7 +725,9 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev, +@@ -700,7 +700,9 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev, if (rp->status) return; @@ -50,5 +49,5 @@ index 0bca035bf..095889890 100644 if (rp->page < HCI_MAX_PAGES) -- -2.34.0 +cgit v1.2.3 diff --git a/patch/kernel/media-current/general-bluetooth-add-new-quirk.patch b/patch/kernel/media-current/general-bluetooth-add-new-quirk.patch index c2e57fe5e..a4614e12b 100644 --- a/patch/kernel/media-current/general-bluetooth-add-new-quirk.patch +++ b/patch/kernel/media-current/general-bluetooth-add-new-quirk.patch @@ -30,9 +30,9 @@ index 16ab6ce87883..8e4c16210d18 100644 + * don't actually support features declared there. + */ + HCI_QUIRK_BROKEN_LOCAL_EXT_FTR_MAX_PAGE, - }; - /* HCI device flags */ + /* + * When this quirk is set, LE tx power is not queried on startup diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index cfeaee347db3..df3232828978 100644 --- a/net/bluetooth/hci_event.c