kernel-5.4.193

This commit is contained in:
DHDAXCW 2022-10-21 06:46:43 +00:00
parent 2492850688
commit 7190302e03
2 changed files with 5 additions and 5 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .190 LINUX_VERSION-5.4 = .193
LINUX_KERNEL_HASH-5.4.190 = 81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194 LINUX_KERNEL_HASH-5.4.193 = 0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0

View File

@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop; goto drop;
@@ -3296,6 +3298,7 @@ static int packet_create(struct net *net @@ -3301,6 +3303,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock); mutex_init(&po->pg_vec_lock);
po->rollover = NULL; po->rollover = NULL;
po->prot_hook.func = packet_rcv; po->prot_hook.func = packet_rcv;
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET) if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt; po->prot_hook.func = packet_rcv_spkt;
@@ -3939,6 +3942,16 @@ packet_setsockopt(struct socket *sock, i @@ -3944,6 +3947,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit; po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0; return 0;
} }
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default: default:
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
@@ -3995,6 +4008,13 @@ static int packet_getsockopt(struct sock @@ -4000,6 +4013,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR: case PACKET_VNET_HDR:
val = po->has_vnet_hdr; val = po->has_vnet_hdr;
break; break;