-
Notifications
You must be signed in to change notification settings - Fork 19.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bcm27xx: fix linux 6.1 compile issues
- Loading branch information
1 parent
02f9363
commit 55b08d2
Showing
2 changed files
with
4 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,16 +24,16 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
--- 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: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,6 +20,6 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
static const struct spi_device_id spidev_spi_ids[] = { | ||
+ { .name = "spidev" }, | ||
{ .name = "bh2228fv" }, | ||
{ .name = "dh2228fv" }, | ||
{ .name = "ltc2488" }, | ||
{ .name = "sx1301" }, |