mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.15 to 5.15.18 (#8805)
Signed-off-by: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com>
This commit is contained in:
parent
370188bfdd
commit
607edf0293
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .17
|
LINUX_VERSION-5.15 = .18
|
||||||
LINUX_KERNEL_HASH-5.15.17 = 2787f5c0cc59984902fd97916dc604f39718c73817497c25f963141bfb70abde
|
LINUX_KERNEL_HASH-5.15.18 = 21dd70e84d776a3403836d435bc523059a43f5bce72c75728981126dd9786c5e
|
||||||
|
@ -182,7 +182,7 @@
|
|||||||
/* Clean trail, interrupt corrects the leds */
|
/* Clean trail, interrupt corrects the leds */
|
||||||
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
|
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
|
||||||
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
|
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
|
||||||
@@ -100,6 +100,10 @@ static int disable_tpa;
|
@@ -110,6 +110,10 @@ static int disable_tpa;
|
||||||
module_param(disable_tpa, int, 0444);
|
module_param(disable_tpa, int, 0444);
|
||||||
MODULE_PARM_DESC(disable_tpa, " Disable the TPA (LRO) feature");
|
MODULE_PARM_DESC(disable_tpa, " Disable the TPA (LRO) feature");
|
||||||
|
|
||||||
@ -193,7 +193,7 @@
|
|||||||
static int int_mode;
|
static int int_mode;
|
||||||
module_param(int_mode, int, 0444);
|
module_param(int_mode, int, 0444);
|
||||||
MODULE_PARM_DESC(int_mode, " Force interrupt mode other than MSI-X "
|
MODULE_PARM_DESC(int_mode, " Force interrupt mode other than MSI-X "
|
||||||
@@ -12325,6 +12329,8 @@ static int bnx2x_init_bp(struct bnx2x *b
|
@@ -12343,6 +12347,8 @@ static int bnx2x_init_bp(struct bnx2x *b
|
||||||
if (BP_NOMCP(bp) && (func == 0))
|
if (BP_NOMCP(bp) && (func == 0))
|
||||||
dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n");
|
dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user