mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.15 to 5.15.31 (#9118)
Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>
This commit is contained in:
parent
6e54b12c58
commit
a3f70fd357
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.15 = .30
|
||||
LINUX_KERNEL_HASH-5.15.30 = 254ea2fe08f0aa07e4f7fffe95d12463df7fa6ff8a9ba72f321da15e50fa7132
|
||||
LINUX_VERSION-5.15 = .31
|
||||
LINUX_KERNEL_HASH-5.15.31 = f621384b47d5bed927910bf5211e7b4ccac925f28218e483bb1a9c484b246b88
|
||||
|
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
goto drop;
|
||||
|
||||
@@ -3322,6 +3324,7 @@ static int packet_create(struct net *net
|
||||
@@ -3325,6 +3327,7 @@ static int packet_create(struct net *net
|
||||
mutex_init(&po->pg_vec_lock);
|
||||
po->rollover = NULL;
|
||||
po->prot_hook.func = packet_rcv;
|
||||
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
if (sock->type == SOCK_PACKET)
|
||||
po->prot_hook.func = packet_rcv_spkt;
|
||||
@@ -3957,6 +3960,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
@@ -3966,6 +3969,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
||||
return 0;
|
||||
}
|
||||
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
default:
|
||||
return -ENOPROTOOPT;
|
||||
}
|
||||
@@ -4013,6 +4026,13 @@ static int packet_getsockopt(struct sock
|
||||
@@ -4022,6 +4035,13 @@ static int packet_getsockopt(struct sock
|
||||
case PACKET_VNET_HDR:
|
||||
val = po->has_vnet_hdr;
|
||||
break;
|
||||
|
@ -193,7 +193,7 @@
|
||||
static int int_mode;
|
||||
module_param(int_mode, int, 0444);
|
||||
MODULE_PARM_DESC(int_mode, " Force interrupt mode other than MSI-X "
|
||||
@@ -12346,6 +12350,8 @@ static int bnx2x_init_bp(struct bnx2x *b
|
||||
@@ -12336,6 +12340,8 @@ static int bnx2x_init_bp(struct bnx2x *b
|
||||
if (BP_NOMCP(bp) && (func == 0))
|
||||
dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user