298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.10 to 5.10.210 (#11914)

Browse Source
This commit is contained in:
Beginner 2024-02-25 00:06:04 +08:00 committed by GitHub
parent 4bd8570032
commit 5373f82d2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 44 additions and 43 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 = .209
LINUX_KERNEL_HASH-5.10.209 = 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5
LINUX_VERSION-5.10 = .210
LINUX_KERNEL_HASH-5.10.210 = 4ea63c5a90fdc3c459ab35c11ee8c93d2364a7cdbfb101100f8cab70d490ef6d

7
target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
View File

@ -86,7 +86,7 @@ SVN-Revision: 35130
} while (word != stop);
return csum_fold(csum);
@@ -180,73 +184,6 @@ static inline __sum16 ip_compute_csum(co
@@ -180,74 +184,6 @@ static inline __sum16 ip_compute_csum(co
return csum_fold(csum_partial(buff, len, 0));
}
@ -152,7 +152,8 @@ SVN-Revision: 35130
- " .set pop"
- : "=&r" (sum), "=&r" (tmp)
- : "r" (saddr), "r" (daddr),
- "0" (htonl(len)), "r" (htonl(proto)), "r" (sum));
- "0" (htonl(len)), "r" (htonl(proto)), "r" (sum)
- : "memory");
-
- return csum_fold(sum);
-}
@ -326,7 +327,7 @@ SVN-Revision: 35130
#endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1471,8 +1471,8 @@ struct sk_buff *inet_gro_receive(struct
@@ -1474,8 +1474,8 @@ struct sk_buff *inet_gro_receive(struct
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock;

2
target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -2142,6 +2142,14 @@ config RAVE_SP_CORE
@@ -2143,6 +2143,14 @@ config RAVE_SP_CORE
Select this to get support for the Supervisory Processor
device found on several devices in RAVE line of hardware.

2
target/linux/generic/backport-5.10/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
View File

@ -55,7 +55,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -239,47 +239,14 @@ static struct nft_expr_type nft_flow_off
@@ -244,47 +244,14 @@ static struct nft_expr_type nft_flow_off
.owner = THIS_MODULE,
};

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

@ -646,7 +646,7 @@
}
/* Reposition in the original skb */
@@ -5203,6 +5224,20 @@ bool skb_try_coalesce(struct sk_buff *to
@@ -5204,6 +5225,20 @@ bool skb_try_coalesce(struct sk_buff *to
if (skb_cloned(to))
return false;

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
+++ b/net/core/skbuff.c
@@ -5224,18 +5224,18 @@ bool skb_try_coalesce(struct sk_buff *to
@@ -5225,18 +5225,18 @@ bool skb_try_coalesce(struct sk_buff *to
if (skb_cloned(to))
return false;

2
target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View File

@ -1706,7 +1706,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
eth_random_addr(dev->macaddr);
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
@@ -990,11 +990,7 @@ static void rt2x00lib_rate(struct ieee80
@@ -991,11 +991,7 @@ static void rt2x00lib_rate(struct ieee80
void rt2x00lib_set_mac_address(struct rt2x00_dev *rt2x00dev, u8 *eeprom_mac_addr)
{

4
target/linux/generic/backport-5.10/822-v5.13-advertise-lack-of-built-in-msi-handling.patch
View File

@ -41,7 +41,7 @@ Acked-by: Bjorn Helgaas <bhelgaas@google.com>
unsigned int device_id;
struct pci_ops *ops;
int (*startup)(struct mtk_pcie_port *port);
@@ -1087,6 +1089,7 @@ static int mtk_pcie_probe(struct platfor
@@ -1093,6 +1095,7 @@ static int mtk_pcie_probe(struct platfor
host->ops = pcie->soc->ops;
host->sysdata = pcie;
@ -49,7 +49,7 @@ Acked-by: Bjorn Helgaas <bhelgaas@google.com>
err = pci_host_probe(host);
if (err)
@@ -1176,6 +1179,7 @@ static const struct dev_pm_ops mtk_pcie_
@@ -1182,6 +1185,7 @@ static const struct dev_pm_ops mtk_pcie_
};
static const struct mtk_pcie_soc mtk_pcie_soc_v1 = {

2
target/linux/generic/pending-5.10/203-kallsyms_uncompressed.patch
View File

@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -192,6 +192,10 @@ kallsyms()
@@ -197,6 +197,10 @@ kallsyms()
kallsymopt="${kallsymopt} --base-relative"
fi

28
target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
View File

@ -275,8 +275,8 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
const struct tnl_ptk_info *tpi,
struct metadata_dst *tun_dst,
@@ -873,6 +999,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
skb_reset_network_header(skb);
@@ -887,6 +1013,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
+ if (tpi->proto == htons(ETH_P_IP) && tunnel->parms.fmrs &&
@ -303,7 +303,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
__skb_tunnel_rx(skb, tunnel->dev, tunnel->net);
err = dscp_ecn_decapsulate(tunnel, ipv6h, skb);
@@ -1024,6 +1171,7 @@ static void init_tel_txopt(struct ipv6_t
@@ -1034,6 +1181,7 @@ static void init_tel_txopt(struct ipv6_t
opt->ops.opt_nflen = 8;
}
@ -311,7 +311,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
/**
* ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
* @t: the outgoing tunnel device
@@ -1304,6 +1452,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
@@ -1314,6 +1462,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
u8 protocol)
{
struct ip6_tnl *t = netdev_priv(dev);
@ -319,7 +319,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
struct ipv6hdr *ipv6h;
const struct iphdr *iph;
int encap_limit = -1;
@@ -1403,6 +1552,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
@@ -1413,6 +1562,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield);
@ -338,7 +338,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
return -1;
@@ -1556,6 +1717,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
@@ -1566,6 +1727,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
t->parms.link = p->link;
t->parms.proto = p->proto;
t->parms.fwmark = p->fwmark;
@ -353,7 +353,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
dst_cache_reset(&t->dst_cache);
ip6_tnl_link_config(t);
return 0;
@@ -1594,6 +1763,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
@@ -1604,6 +1773,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
p->flowinfo = u->flowinfo;
p->link = u->link;
p->proto = u->proto;
@ -361,7 +361,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
memcpy(p->name, u->name, sizeof(u->name));
}
@@ -1979,6 +2149,15 @@ static int ip6_tnl_validate(struct nlatt
@@ -1989,6 +2159,15 @@ static int ip6_tnl_validate(struct nlatt
return 0;
}
@ -377,7 +377,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
static void ip6_tnl_netlink_parms(struct nlattr *data[],
struct __ip6_tnl_parm *parms)
{
@@ -2016,6 +2195,46 @@ static void ip6_tnl_netlink_parms(struct
@@ -2026,6 +2205,46 @@ static void ip6_tnl_netlink_parms(struct
if (data[IFLA_IPTUN_FWMARK])
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
@ -424,7 +424,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
}
static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
@@ -2131,6 +2350,12 @@ static void ip6_tnl_dellink(struct net_d
@@ -2141,6 +2360,12 @@ static void ip6_tnl_dellink(struct net_d
static size_t ip6_tnl_get_size(const struct net_device *dev)
{
@ -437,7 +437,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
return
/* IFLA_IPTUN_LINK */
nla_total_size(4) +
@@ -2160,6 +2385,24 @@ static size_t ip6_tnl_get_size(const str
@@ -2170,6 +2395,24 @@ static size_t ip6_tnl_get_size(const str
nla_total_size(0) +
/* IFLA_IPTUN_FWMARK */
nla_total_size(4) +
@ -462,7 +462,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
0;
}
@@ -2167,6 +2410,9 @@ static int ip6_tnl_fill_info(struct sk_b
@@ -2177,6 +2420,9 @@ static int ip6_tnl_fill_info(struct sk_b
{
struct ip6_tnl *tunnel = netdev_priv(dev);
struct __ip6_tnl_parm *parm = &tunnel->parms;
@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
@@ -2176,9 +2422,27 @@ static int ip6_tnl_fill_info(struct sk_b
@@ -2186,9 +2432,27 @@ static int ip6_tnl_fill_info(struct sk_b
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
@ -501,7 +501,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
@@ -2218,6 +2482,7 @@ static const struct nla_policy ip6_tnl_p
@@ -2228,6 +2492,7 @@ static const struct nla_policy ip6_tnl_p
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG },
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },

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
+++ b/net/core/skbuff.c
@@ -4175,6 +4175,15 @@ int skb_gro_receive(struct sk_buff *p, s
@@ -4176,6 +4176,15 @@ int skb_gro_receive(struct sk_buff *p, s
if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush))
return -E2BIG;

6
target/linux/generic/pending-5.10/810-pci_disable_common_quirks.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
/*
* The Mellanox Tavor device gives false positive parity errors. Mark this
* device with a broken_parity_status to allow PCI scanning code to "skip"
@@ -3337,6 +3338,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
@@ -3340,6 +3341,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
/*
* Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.
* To work around this, query the size it should be configured to by the
@@ -3362,6 +3365,8 @@ static void quirk_intel_ntb(struct pci_d
@@ -3365,6 +3368,8 @@ static void quirk_intel_ntb(struct pci_d
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
/*
* Some BIOS implementations leave the Intel GPU interrupts enabled, even
* though no one is handling them (e.g., if the i915 driver is never
@@ -3400,6 +3405,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
@@ -3403,6 +3408,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);

2
target/linux/mvebu/patches-5.10/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch
View File

@ -26,7 +26,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -2155,6 +2155,15 @@ config SGI_MFD_IOC3
@@ -2156,6 +2156,15 @@ config SGI_MFD_IOC3
If you have an SGI Origin, Octane, or a PCI IOC3 card,
then say Y. Otherwise say N.

18
target/linux/phytium/patches-5.10/001-add-phytium-support.patch
View File

@ -1849,7 +1849,7 @@
+obj-$(CONFIG_PHYTIUM_IXIC) += irq-phytium-ixic.o
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -4788,6 +4788,7 @@ static void its_restore_enable(void)
@@ -4792,6 +4792,7 @@ static void its_restore_enable(void)
{
struct its_node *its;
int ret;
@ -1857,7 +1857,7 @@
raw_spin_lock(&its_lock);
list_for_each_entry(its, &its_nodes, entry) {
@@ -4841,6 +4842,23 @@ static void its_restore_enable(void)
@@ -4845,6 +4846,23 @@ static void its_restore_enable(void)
GITS_TYPER_HCC(gic_read_typer(base + GITS_TYPER)))
its_cpu_init_collection(its);
}
@ -4412,7 +4412,7 @@
#include "pci.h"
static ktime_t fixup_debug_start(struct pci_dev *dev,
@@ -3885,12 +3886,12 @@ static int nvme_disable_and_flr(struct p
@@ -3901,12 +3902,12 @@ static int nvme_disable_and_flr(struct p
void __iomem *bar;
u16 cmd;
u32 cfg;
@ -4427,7 +4427,7 @@
return 0;
bar = pci_iomap(dev, 0, NVME_REG_CC + sizeof(cfg));
@@ -3944,7 +3945,7 @@ static int nvme_disable_and_flr(struct p
@@ -3960,7 +3961,7 @@ static int nvme_disable_and_flr(struct p
pci_iounmap(dev, bar);
pcie_flr(dev);
@ -4436,7 +4436,7 @@
return 0;
}
@@ -4040,6 +4041,7 @@ static const struct pci_dev_reset_method
@@ -4056,6 +4057,7 @@ static const struct pci_dev_reset_method
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_M2_VGA,
reset_ivb_igd },
{ PCI_VENDOR_ID_SAMSUNG, 0xa804, nvme_disable_and_flr },
@ -4444,7 +4444,7 @@
{ PCI_VENDOR_ID_INTEL, 0x0953, delay_250ms_after_flr },
{ PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,
reset_chelsio_generic_dev },
@@ -4979,6 +4981,10 @@ static const struct pci_dev_acs_enabled
@@ -4995,6 +4997,10 @@ static const struct pci_dev_acs_enabled
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
/* Wangxun nics */
{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
@ -4455,7 +4455,7 @@
{ 0 }
};
@@ -5362,6 +5368,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SE
@@ -5378,6 +5384,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SE
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0144, quirk_no_ext_tags);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0420, quirk_no_ext_tags);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags);
@ -4747,7 +4747,7 @@
else
priv_match = dev_get_platdata(&pdev->dev);
@@ -533,6 +542,7 @@ static const struct dev_pm_ops xhci_plat
@@ -536,6 +545,7 @@ static const struct dev_pm_ops xhci_plat
static const struct acpi_device_id usb_xhci_acpi_match[] = {
/* XHCI-compliant USB Controller */
{ "PNP0D10", },
@ -4835,7 +4835,7 @@
};
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -3141,4 +3141,6 @@
@@ -3142,4 +3142,6 @@
#define PCI_VENDOR_ID_NCUBE 0x10ff

4
target/linux/ramips/patches-5.10/903-mtkhnat-add-support-for-interface-acceleration.patch
View File

@ -193,7 +193,7 @@
MODULE_AUTHOR("Ville Nuorvala");
MODULE_DESCRIPTION("IPv6 tunneling device");
@@ -1938,6 +1939,20 @@ int ip6_tnl_change_mtu(struct net_device
@@ -1948,6 +1949,20 @@ int ip6_tnl_change_mtu(struct net_device
}
EXPORT_SYMBOL(ip6_tnl_change_mtu);
@ -214,7 +214,7 @@
int ip6_tnl_get_iflink(const struct net_device *dev)
{
struct ip6_tnl *t = netdev_priv(dev);
@@ -2007,6 +2022,7 @@ static const struct net_device_ops ip6_t
@@ -2017,6 +2032,7 @@ static const struct net_device_ops ip6_t
.ndo_change_mtu = ip6_tnl_change_mtu,
.ndo_get_stats = ip6_get_stats,
.ndo_get_iflink = ip6_tnl_get_iflink,