From e5cec69484274ab6161d90397e065d17c7cbd406 Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 8 Dec 2022 08:49:33 -0500 Subject: kernel: bump 5.10 to 5.10.158 All patches automatically rebased. Signed-off-by: John Audia (cherry picked from commit 6801c460b6a72e324c6fc24bc5c14ff3afceb139) --- target/linux/generic/pending-5.10/630-packet_socket_type.patch | 6 +++--- .../703-phy-add-detach-callback-to-struct-phy_driver.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/pending-5.10') diff --git a/target/linux/generic/pending-5.10/630-packet_socket_type.patch b/target/linux/generic/pending-5.10/630-packet_socket_type.patch index 26fd8bc754..beff8bda78 100644 --- a/target/linux/generic/pending-5.10/630-packet_socket_type.patch +++ b/target/linux/generic/pending-5.10/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; -@@ -3330,6 +3332,7 @@ static int packet_create(struct net *net +@@ -3329,6 +3331,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; -@@ -3974,6 +3977,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3972,6 +3975,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; } -@@ -4030,6 +4043,13 @@ static int packet_getsockopt(struct sock +@@ -4028,6 +4041,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/pending-5.10/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-5.10/703-phy-add-detach-callback-to-struct-phy_driver.patch index 52350ecccc..068ed323a9 100644 --- a/target/linux/generic/pending-5.10/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ b/target/linux/generic/pending-5.10/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 -@@ -1651,6 +1651,9 @@ void phy_detach(struct phy_device *phyde +@@ -1652,6 +1652,9 @@ void phy_detach(struct phy_device *phyde struct module *ndev_owner = NULL; struct mii_bus *bus; -- cgit v1.2.3