From 5d87cf5616f92e842ce76d9027153843a1b79452 Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Fri, 2 Sep 2022 01:23:58 +0800 Subject: [PATCH] kernel: refresh 5.19 patch (#10033) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- .../generic/backport-5.19/002-struct-net_device.patch | 4 ++-- ...ilter-nft_flow_offload-handle-netdevice-events-f.patch | 2 +- .../760-net-usb-r8152-add-LED-configuration-from-OF.patch | 8 ++++---- target/linux/generic/hack-5.19/902-debloat_proc.patch | 2 +- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 2 +- target/linux/x86/patches-5.19/992-enable-intel-guc.patch | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/generic/backport-5.19/002-struct-net_device.patch b/target/linux/generic/backport-5.19/002-struct-net_device.patch index 1a2e54da9..8f4262c4b 100644 --- a/target/linux/generic/backport-5.19/002-struct-net_device.patch +++ b/target/linux/generic/backport-5.19/002-struct-net_device.patch @@ -1,6 +1,6 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2119,8 +2119,6 @@ struct net_device { +@@ -2133,8 +2133,6 @@ struct net_device { /* Protocol-specific pointers */ @@ -9,7 +9,7 @@ #if IS_ENABLED(CONFIG_VLAN_8021Q) struct vlan_info __rcu *vlan_info; #endif -@@ -2133,18 +2131,16 @@ struct net_device { +@@ -2147,18 +2145,16 @@ struct net_device { #if IS_ENABLED(CONFIG_ATALK) void *atalk_ptr; #endif diff --git a/target/linux/generic/backport-5.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch b/target/linux/generic/backport-5.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch index e79fa57d8..826e0185e 100644 --- a/target/linux/generic/backport-5.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch +++ b/target/linux/generic/backport-5.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch @@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/net/netfilter/nf_flow_table_core.c +++ b/net/netfilter/nf_flow_table_core.c -@@ -614,13 +614,41 @@ void nf_flow_table_free(struct nf_flowta +@@ -619,13 +619,41 @@ void nf_flow_table_free(struct nf_flowta } EXPORT_SYMBOL_GPL(nf_flow_table_free); diff --git a/target/linux/generic/hack-5.19/760-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/generic/hack-5.19/760-net-usb-r8152-add-LED-configuration-from-OF.patch index db471b4f0..2ac9dcf07 100644 --- a/target/linux/generic/hack-5.19/760-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/generic/hack-5.19/760-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -6866,6 +6867,22 @@ static void rtl_tally_reset(struct r8152 +@@ -6863,6 +6864,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -6907,6 +6924,8 @@ static void r8152b_init(struct r8152 *tp +@@ -6904,6 +6921,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -7047,6 +7066,8 @@ static void r8153_init(struct r8152 *tp) +@@ -7044,6 +7063,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -7129,6 +7150,8 @@ static void r8153b_init(struct r8152 *tp +@@ -7126,6 +7147,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ diff --git a/target/linux/generic/hack-5.19/902-debloat_proc.patch b/target/linux/generic/hack-5.19/902-debloat_proc.patch index 769cb67d7..2759191a7 100644 --- a/target/linux/generic/hack-5.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.19/902-debloat_proc.patch @@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3997,6 +3997,8 @@ static __net_initdata struct pernet_oper +@@ -3999,6 +3999,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { diff --git a/target/linux/generic/pending-5.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index d46c23dbb..50a0c0943 100644 --- a/target/linux/generic/pending-5.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2103,6 +2103,8 @@ struct net_device { +@@ -2117,6 +2117,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; diff --git a/target/linux/x86/patches-5.19/992-enable-intel-guc.patch b/target/linux/x86/patches-5.19/992-enable-intel-guc.patch index 1b6df88e5..26ea41594 100644 --- a/target/linux/x86/patches-5.19/992-enable-intel-guc.patch +++ b/target/linux/x86/patches-5.19/992-enable-intel-guc.patch @@ -2,7 +2,7 @@ +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -26,7 +26,7 @@ static void uc_expand_default_options(st return; - + /* Don't enable GuC/HuC on pre-Gen12 */ - if (GRAPHICS_VER(i915) < 12) { + if (GRAPHICS_VER(i915) < 9) {