From 419f7c78eb1df88886d33f6d792843198d876cbe Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Fri, 9 Dec 2022 01:23:41 +0800 Subject: [PATCH] kernel: bump 6.0 to 6.0.12 (#10567) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- include/kernel-6.0 | 4 ++-- .../linux/generic/pending-6.0/630-packet_socket_type.patch | 6 +++--- .../703-phy-add-detach-callback-to-struct-phy_driver.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/kernel-6.0 b/include/kernel-6.0 index bd736d508..b4ca44026 100644 --- a/include/kernel-6.0 +++ b/include/kernel-6.0 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.0 = .11 -LINUX_KERNEL_HASH-6.0.11 = 2bae6131e64971e1e34ff395fa542971134c857bdb0b29069ab847c7c9a9c762 +LINUX_VERSION-6.0 = .12 +LINUX_KERNEL_HASH-6.0.12 = 89b730edf8942b49e02f9894244205886c9a214d629b35b88c4ff06ee9304f01 diff --git a/target/linux/generic/pending-6.0/630-packet_socket_type.patch b/target/linux/generic/pending-6.0/630-packet_socket_type.patch index b11d87af2..db6f4a69d 100644 --- a/target/linux/generic/pending-6.0/630-packet_socket_type.patch +++ b/target/linux/generic/pending-6.0/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; -@@ -3372,6 +3374,7 @@ static int packet_create(struct net *net +@@ -3371,6 +3373,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; -@@ -4011,6 +4014,16 @@ packet_setsockopt(struct socket *sock, i +@@ -4009,6 +4012,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; } -@@ -4067,6 +4080,13 @@ static int packet_getsockopt(struct sock +@@ -4065,6 +4078,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/pending-6.0/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-6.0/703-phy-add-detach-callback-to-struct-phy_driver.patch index c50f55431..5cf476365 100644 --- a/target/linux/generic/pending-6.0/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ b/target/linux/generic/pending-6.0/703-phy-add-detach-callback-to-struct-phy_driver.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1746,6 +1746,9 @@ void phy_detach(struct phy_device *phyde +@@ -1748,6 +1748,9 @@ void phy_detach(struct phy_device *phyde struct module *ndev_owner = NULL; struct mii_bus *bus;