From 7190302e03530f7c120ea5fd37e8ac33644c42bd Mon Sep 17 00:00:00 2001 From: DHDAXCW Date: Fri, 21 Oct 2022 06:46:43 +0000 Subject: [PATCH] kernel-5.4.193 --- include/kernel-5.4 | 4 ++-- .../linux/generic/pending-5.4/630-packet_socket_type.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/kernel-5.4 b/include/kernel-5.4 index 954b8a1a7..b820a01c9 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .190 -LINUX_KERNEL_HASH-5.4.190 = 81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194 +LINUX_VERSION-5.4 = .193 +LINUX_KERNEL_HASH-5.4.193 = 0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0 diff --git a/target/linux/generic/pending-5.4/630-packet_socket_type.patch b/target/linux/generic/pending-5.4/630-packet_socket_type.patch index 0e6feecc5..54c087bf6 100644 --- a/target/linux/generic/pending-5.4/630-packet_socket_type.patch +++ b/target/linux/generic/pending-5.4/630-packet_socket_type.patch @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) 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); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) 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; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: 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: val = po->has_vnet_hdr; break;