298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-06-19 01:35:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.10 to 5.10.217 (#12174)

Browse Source
This commit is contained in:
Beginner 2024-05-20 23:40:29 +08:00 committed by GitHub
parent bcbc08ab45
commit ad11245663
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.10
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .216 LINUX_VERSION-5.10 = .217
LINUX_KERNEL_HASH-5.10.216 = e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151 LINUX_KERNEL_HASH-5.10.217 = c52bc1ffc396c11bce335c9ee5cd55fe4213cbc1fb4026ff62bb90c864c61f62

16
target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
View File

@ -574,7 +574,7 @@
union { union {
--- a/net/core/skbuff.c --- a/net/core/skbuff.c
+++ b/net/core/skbuff.c +++ b/net/core/skbuff.c
@@ -594,13 +594,22 @@ static void skb_clone_fraglist(struct sk @@ -595,13 +595,22 @@ static void skb_clone_fraglist(struct sk
skb_get(list); skb_get(list);
} }
@ -599,7 +599,7 @@
kfree(head); kfree(head);
} }
@@ -612,16 +621,27 @@ static void skb_release_data(struct sk_b @@ -613,16 +622,27 @@ static void skb_release_data(struct sk_b
if (skb->cloned && if (skb->cloned &&
atomic_sub_return(skb->nohdr ? (1 << SKB_DATAREF_SHIFT) + 1 : 1, atomic_sub_return(skb->nohdr ? (1 << SKB_DATAREF_SHIFT) + 1 : 1,
&shinfo->dataref)) &shinfo->dataref))
@ -629,7 +629,7 @@
} }
/* /*
@@ -1002,6 +1022,7 @@ static struct sk_buff *__skb_clone(struc @@ -1003,6 +1023,7 @@ static struct sk_buff *__skb_clone(struc
n->nohdr = 0; n->nohdr = 0;
n->peeked = 0; n->peeked = 0;
C(pfmemalloc); C(pfmemalloc);
@ -637,7 +637,7 @@
n->destructor = NULL; n->destructor = NULL;
C(tail); C(tail);
C(end); C(end);
@@ -3420,7 +3441,7 @@ int skb_shift(struct sk_buff *tgt, struc @@ -3432,7 +3453,7 @@ int skb_shift(struct sk_buff *tgt, struc
fragto = &skb_shinfo(tgt)->frags[merge]; fragto = &skb_shinfo(tgt)->frags[merge];
skb_frag_size_add(fragto, skb_frag_size(fragfrom)); skb_frag_size_add(fragto, skb_frag_size(fragfrom));
@ -646,7 +646,7 @@
} }
/* Reposition in the original skb */ /* Reposition in the original skb */
@@ -5204,6 +5225,20 @@ bool skb_try_coalesce(struct sk_buff *to @@ -5216,6 +5237,20 @@ bool skb_try_coalesce(struct sk_buff *to
if (skb_cloned(to)) if (skb_cloned(to))
return false; return false;
@ -687,7 +687,7 @@
#ifdef CONFIG_SKB_EXTENSIONS #ifdef CONFIG_SKB_EXTENSIONS
__u8 active_extensions; __u8 active_extensions;
#endif #endif
@@ -3030,9 +3032,15 @@ static inline void skb_frag_ref(struct s @@ -3045,9 +3047,15 @@ static inline void skb_frag_ref(struct s
* *
* Releases a reference on the paged fragment @frag. * Releases a reference on the paged fragment @frag.
*/ */
@ -705,7 +705,7 @@
} }
/** /**
@@ -3044,7 +3052,7 @@ static inline void __skb_frag_unref(skb_ @@ -3059,7 +3067,7 @@ static inline void __skb_frag_unref(skb_
*/ */
static inline void skb_frag_unref(struct sk_buff *skb, int f) static inline void skb_frag_unref(struct sk_buff *skb, int f)
{ {
@ -714,7 +714,7 @@
} }
/** /**
@@ -4643,5 +4651,12 @@ static inline u64 skb_get_kcov_handle(st @@ -4658,5 +4666,12 @@ static inline u64 skb_get_kcov_handle(st
#endif #endif
} }

2
target/linux/generic/backport-5.10/633-v6.3-skbuff-Fix-a-race-between-coalescing-and-releasing-S.patch
View File

@ -56,7 +56,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/net/core/skbuff.c --- a/net/core/skbuff.c
+++ b/net/core/skbuff.c +++ b/net/core/skbuff.c
@@ -5225,18 +5225,18 @@ bool skb_try_coalesce(struct sk_buff *to @@ -5237,18 +5237,18 @@ bool skb_try_coalesce(struct sk_buff *to
if (skb_cloned(to)) if (skb_cloned(to))
return false; return false;

10
target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch
View File

@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/ */
--- a/include/linux/skbuff.h --- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h +++ b/include/linux/skbuff.h
@@ -2728,6 +2728,10 @@ static inline int pskb_trim(struct sk_bu @@ -2743,6 +2743,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0; return (len < skb->len) ? __pskb_trim(skb, len) : 0;
} }
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/** /**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer * pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter * @skb: buffer to alter
@@ -2859,16 +2863,6 @@ static inline struct sk_buff *dev_alloc_ @@ -2874,16 +2878,6 @@ static inline struct sk_buff *dev_alloc_
} }
@ -119,15 +119,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
trace_net_dev_start_xmit(skb, dev); trace_net_dev_start_xmit(skb, dev);
--- a/net/core/skbuff.c --- a/net/core/skbuff.c
+++ b/net/core/skbuff.c +++ b/net/core/skbuff.c
@@ -60,6 +60,7 @@ @@ -61,6 +61,7 @@
#include <linux/prefetch.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/mpls.h> #include <linux/mpls.h>
#include <linux/kcov.h>
+#include <linux/if.h> +#include <linux/if.h>
#include <net/protocol.h> #include <net/protocol.h>
#include <net/dst.h> #include <net/dst.h>
@@ -553,6 +554,22 @@ skb_fail: @@ -554,6 +555,22 @@ skb_fail:
} }
EXPORT_SYMBOL(__napi_alloc_skb); EXPORT_SYMBOL(__napi_alloc_skb);

4
target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

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

2
target/linux/generic/pending-5.10/655-increase_skb_pad.patch
View File

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

16
target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -1995,6 +1995,8 @@ struct net_device { @@ -2061,6 +2061,8 @@ struct net_device {
struct netdev_hw_addr_list mc; struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs; struct netdev_hw_addr_list dev_addrs;
@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif #endif
--- a/include/linux/skbuff.h --- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h +++ b/include/linux/skbuff.h
@@ -831,6 +831,7 @@ struct sk_buff { @@ -868,6 +868,7 @@ struct sk_buff {
#ifdef CONFIG_NET_SCHED #ifdef CONFIG_NET_SCHED
__u16 tc_index; /* traffic control index */ __u16 tc_index; /* traffic control index */
#endif #endif
@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__wsum csum; __wsum csum;
--- a/net/core/dev.c --- a/net/core/dev.c
+++ b/net/core/dev.c +++ b/net/core/dev.c
@@ -5516,6 +5516,9 @@ static enum gro_result dev_gro_receive(s @@ -6081,6 +6081,9 @@ static enum gro_result dev_gro_receive(s
int same_flow; int same_flow;
int grow; int grow;
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netif_elide_gro(skb->dev)) if (netif_elide_gro(skb->dev))
goto normal; goto normal;
@@ -7318,6 +7321,48 @@ static void __netdev_adjacent_dev_unlink @@ -8060,6 +8063,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower); &upper_dev->adj_list.lower);
} }
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int __netdev_upper_dev_link(struct net_device *dev, static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master, struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info, void *upper_priv, void *upper_info,
@@ -7368,6 +7413,7 @@ static int __netdev_upper_dev_link(struc @@ -8111,6 +8156,7 @@ static int __netdev_upper_dev_link(struc
if (ret) if (ret)
return ret; return ret;
@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info); &changeupper_info.info);
ret = notifier_to_errno(ret); ret = notifier_to_errno(ret);
@@ -7461,6 +7507,7 @@ void netdev_upper_dev_unlink(struct net_ @@ -8207,6 +8253,7 @@ static void __netdev_upper_dev_unlink(st
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info); &changeupper_info.info);
@@ -8191,6 +8238,7 @@ int dev_set_mac_address(struct net_devic @@ -8993,6 +9040,7 @@ int dev_set_mac_address(struct net_devic
if (err) if (err)
return err; return err;
dev->addr_assign_type = NET_ADDR_SET; dev->addr_assign_type = NET_ADDR_SET;
@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/** /**
* eth_type_trans - determine the packet's protocol ID. * eth_type_trans - determine the packet's protocol ID.
* @skb: received socket data * @skb: received socket data
@@ -184,6 +184,9 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) @@ -166,6 +178,9 @@ __be16 eth_type_trans(struct sk_buff *sk
eth_skb_pkt_type(skb, dev); eth_skb_pkt_type(skb, dev);

2
target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
--- a/net/core/skbuff.c --- a/net/core/skbuff.c
+++ b/net/core/skbuff.c +++ b/net/core/skbuff.c
@@ -4176,6 +4176,15 @@ int skb_gro_receive(struct sk_buff *p, s @@ -4188,6 +4188,15 @@ int skb_gro_receive(struct sk_buff *p, s
if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush)) if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush))
return -E2BIG; return -E2BIG;

4
target/linux/ramips/patches-5.10/902-mtkhnat-fix-pskb-expand-head-limitation.patch
View File

@ -1,6 +1,6 @@
--- a/net/core/skbuff.c --- a/net/core/skbuff.c
+++ b/net/core/skbuff.c +++ b/net/core/skbuff.c
@@ -70,6 +70,7 @@ @@ -71,6 +71,7 @@
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/mpls.h> #include <net/mpls.h>
#include <net/mptcp.h> #include <net/mptcp.h>
@ -8,7 +8,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <trace/events/skb.h> #include <trace/events/skb.h>
@@ -1686,6 +1687,9 @@ int pskb_expand_head(struct sk_buff *skb @@ -1693,6 +1694,9 @@ int pskb_expand_head(struct sk_buff *skb
skb_shinfo(skb), skb_shinfo(skb),
offsetof(struct skb_shared_info, frags[skb_shinfo(skb)->nr_frags])); offsetof(struct skb_shared_info, frags[skb_shinfo(skb)->nr_frags]));