From 55b08d205281238beae3bfe16ef603000395f877 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sun, 29 Sep 2024 18:54:51 +0800 Subject: [PATCH] bcm27xx: fix linux 6.1 compile issues --- ...vert-Bluetooth-Always-request-for-user-confirmatio.patch | 6 +++--- ...0-0351-spi-spidev-Restore-loading-from-Device-Tree.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch b/target/linux/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch index bd2ccaa1978ab8..8231bc32b77172 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch @@ -24,16 +24,16 @@ Signed-off-by: Phil Elwell --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c -@@ -2214,7 +2214,7 @@ mackey_and_ltk: +@@ -2208,7 +2208,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb) if (err) return SMP_UNSPECIFIED; - if (smp->method == REQ_OOB) { + if (smp->method == JUST_WORKS || smp->method == REQ_OOB) { - if (hcon->out) { + if (test_bit(SMP_FLAG_INITIATOR, &smp->flags)) { sc_dhkey_check(smp); SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK); -@@ -2229,9 +2229,6 @@ mackey_and_ltk: +@@ -2223,9 +2223,6 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb) confirm_hint = 0; confirm: diff --git a/target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch b/target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch index 72bb627cf881f9..9b58103f8e5e79 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch @@ -20,6 +20,6 @@ Signed-off-by: Phil Elwell static const struct spi_device_id spidev_spi_ids[] = { + { .name = "spidev" }, + { .name = "bh2228fv" }, { .name = "dh2228fv" }, { .name = "ltc2488" }, - { .name = "sx1301" },