5.15.75 6.0.5

This commit is contained in:
DHDAXCW 2022-10-27 04:17:00 +00:00
parent 409269b7c6
commit 3005d9099e
8 changed files with 15 additions and 15 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .74
LINUX_KERNEL_HASH-5.15.74 = 2c1539a2f85b835c36c4a07c8270b52b0bec38fdda7339477d07f0c3af8c4265
LINUX_VERSION-5.15 = .75
LINUX_KERNEL_HASH-5.15.75 = d9a65bdd3659ccf55acf42268a27f7989b1500815ae51223aadbad9aeec45fc6

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.0 = .3
LINUX_KERNEL_HASH-6.0.3 = b0d522241805794d8af3a67d331ba063a16496c6fb6d365d48f7ed78ee1c3dcf
LINUX_VERSION-6.0 = .5
LINUX_KERNEL_HASH-6.0.5 = 61332ef22b53c50c10faabfb965896a7d1ad4f3381f0f89643c820f28a60418e

View File

@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2851,6 +2851,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2853,6 +2853,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@ -82,7 +82,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -3001,16 +3005,6 @@ static inline struct sk_buff *dev_alloc_
@@ -3003,16 +3007,6 @@ static inline struct sk_buff *dev_alloc_
}

View File

@ -22,7 +22,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -6861,6 +6862,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 <mail@david-bauer.net>
static void r8152b_init(struct r8152 *tp)
{
u32 ocp_data;
@@ -6902,6 +6919,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 <mail@david-bauer.net>
}
static void r8153_init(struct r8152 *tp)
@@ -7042,6 +7061,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 <mail@david-bauer.net>
}
static void r8153b_init(struct r8152 *tp)
@@ -7124,6 +7145,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 */

View File

@ -110,7 +110,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
depends on NETFILTER_ADVANCED
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2878,6 +2878,10 @@ int nf_conntrack_init_net(struct net *ne
@@ -2886,6 +2886,10 @@ int nf_conntrack_init_net(struct net *ne
nf_conntrack_helper_pernet_init(net);
nf_conntrack_proto_pernet_init(net);

View File

@ -12,9 +12,9 @@
struct list_head *br_ip_list);
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -912,6 +912,10 @@ struct sk_buff {
#endif
@@ -914,6 +914,10 @@ struct sk_buff {
__u8 slow_gro:1;
__u8 scm_io_uring:1;
+#ifdef CONFIG_SHORTCUT_FE
+ __u8 fast_forwarded:1;

View File

@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2817,7 +2817,7 @@ static inline int pskb_network_may_pull(
@@ -2819,7 +2819,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD

View File

@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -890,6 +890,7 @@ struct sk_buff {
@@ -891,6 +891,7 @@ struct sk_buff {
#ifdef CONFIG_IPV6_NDISC_NODETYPE
__u8 ndisc_nodetype:2;
#endif