298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-17 21:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.4 to 5.4.263 ()

Browse Source
This commit is contained in:
aakkll 2023-12-09 13:09:25 +08:00 committed by GitHub
parent 93443d24b4
commit 4efca503b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 26 deletions

4
include/kernel-5.4
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .260
LINUX_KERNEL_HASH-5.4.260 = 9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfe
LINUX_VERSION-5.4 = .263
LINUX_KERNEL_HASH-5.4.263 = 50d0db9a94118b2d45f2ea1ed7b094cfd39f32829e4a2b51473dd3a8257735f8

4
target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View File

@ -1000,7 +1000,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
u32 mahr = ravb_read(ndev, MAHR);
u32 malr = ravb_read(ndev, MALR);
@@ -2154,7 +2156,7 @@ static int ravb_probe(struct platform_de
@@ -2165,7 +2167,7 @@ static int ravb_probe(struct platform_de
priv->msg_enable = RAVB_DEF_MSG_ENABLE;
/* Read and set MAC address */
@ -1302,7 +1302,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int irq;
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4477,7 +4477,7 @@ int stmmac_dvr_probe(struct device *devi
@@ -4519,7 +4519,7 @@ int stmmac_dvr_probe(struct device *devi
priv->wol_irq = res->wol_irq;
priv->lpi_irq = res->lpi_irq;

2
target/linux/generic/hack-5.4/259-regmap_dynamic.patch
View File

@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <linux/mutex.h>
#include <linux/err.h>
#include <linux/of.h>
@@ -3120,3 +3121,5 @@ static int __init regmap_initcall(void)
@@ -3122,3 +3123,5 @@ static int __init regmap_initcall(void)
return 0;
}
postcore_initcall(regmap_initcall);

2
target/linux/generic/hack-5.4/995-usb-serial-option-add-ec200a.patch
View File

@ -8,7 +8,7 @@
#define QUECTEL_PRODUCT_RM500K 0x7001
#define CMOTECH_VENDOR_ID 0x16d8
@@ -1242,6 +1243,7 @@ static const struct usb_device_id option
@@ -1244,6 +1245,7 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200U, 0xff, 0, 0) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },

10
target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
View File

@ -110,7 +110,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -1516,6 +1516,7 @@ enum nft_object_attributes {
@@ -1517,6 +1517,7 @@ enum nft_object_attributes {
* @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
* @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
* @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
@ -118,7 +118,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
*/
enum nft_flowtable_attributes {
NFTA_FLOWTABLE_UNSPEC,
@@ -1525,6 +1526,7 @@ enum nft_flowtable_attributes {
@@ -1526,6 +1527,7 @@ enum nft_flowtable_attributes {
NFTA_FLOWTABLE_USE,
NFTA_FLOWTABLE_HANDLE,
NFTA_FLOWTABLE_PAD,
@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+MODULE_ALIAS("nf-flow-table-hw");
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5889,6 +5889,13 @@ static int nf_tables_flowtable_parse_hoo
@@ -5974,6 +5974,13 @@ static int nf_tables_flowtable_parse_hoo
if (err < 0)
return err;
@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
if (!ops)
return -ENOMEM;
@@ -6024,10 +6031,19 @@ static int nf_tables_newflowtable(struct
@@ -6118,10 +6125,19 @@ static int nf_tables_newflowtable(struct
}
flowtable->data.type = type;
@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
flowtable);
if (err < 0)
@@ -6150,7 +6166,8 @@ static int nf_tables_fill_flowtable_info
@@ -6247,7 +6263,8 @@ static int nf_tables_fill_flowtable_info
nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),

6
target/linux/ipq806x/patches-5.4/850-soc-add-qualcomm-syscon.patch
View File

@ -8,11 +8,11 @@ Subject: SoC: add qualcomm syscon
obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
+obj-$(CONFIG_QCOM_TCSR) += qcom_tcsr.o
obj-$(CONFIG_QCOM_APR) += apr.o
obj-$(CONFIG_QCOM_LLCC) += llcc-slice.o
obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o
obj-$(CONFIG_QCOM_LLCC) += llcc-qcom.o
obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -184,6 +184,13 @@ config QCOM_SOCINFO
@@ -176,6 +176,13 @@ config QCOM_SOCINFO
Say yes here to support the Qualcomm socinfo driver, providing
information about the SoC to user space.

22
target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch
View File

@ -514,7 +514,7 @@
if (bond_is_lb(bond))
bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
} else {
@@ -1412,6 +1430,7 @@ int bond_enslave(struct net_device *bond
@@ -1418,6 +1436,7 @@ int bond_enslave(struct net_device *bond
const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
struct slave *new_slave = NULL, *prev_slave;
struct sockaddr_storage ss;
@ -522,7 +522,7 @@
int link_reporting;
int res = 0, i;
@@ -1811,6 +1830,13 @@ int bond_enslave(struct net_device *bond
@@ -1817,6 +1836,13 @@ int bond_enslave(struct net_device *bond
if (bond_mode_can_use_xmit_hash(bond))
bond_update_slave_arr(bond, NULL);
@ -536,7 +536,7 @@
slave_info(bond_dev, slave_dev, "Enslaving as %s interface with %s link\n",
bond_is_active_slave(new_slave) ? "an active" : "a backup",
@@ -1883,6 +1909,14 @@ err_undo_flags:
@@ -1889,6 +1915,14 @@ err_undo_flags:
}
}
@ -551,7 +551,7 @@
return res;
}
@@ -1904,6 +1938,7 @@ static int __bond_release_one(struct net
@@ -1910,6 +1944,7 @@ static int __bond_release_one(struct net
struct bonding *bond = netdev_priv(bond_dev);
struct slave *slave, *oldcurrent;
struct sockaddr_storage ss;
@ -559,7 +559,7 @@
int old_flags = bond_dev->flags;
netdev_features_t old_features = bond_dev->features;
@@ -1926,6 +1961,14 @@ static int __bond_release_one(struct net
@@ -1932,6 +1967,14 @@ static int __bond_release_one(struct net
bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW);
@ -574,7 +574,7 @@
bond_sysfs_slave_del(slave);
/* recompute stats just before removing the slave */
@@ -2231,6 +2274,10 @@ static void bond_miimon_commit(struct bo
@@ -2237,6 +2280,10 @@ static void bond_miimon_commit(struct bo
{
struct list_head *iter;
struct slave *slave, *primary;
@ -585,7 +585,7 @@
bond_for_each_slave(bond, slave, iter) {
switch (slave->link_new_state) {
@@ -2274,6 +2321,12 @@ static void bond_miimon_commit(struct bo
@@ -2280,6 +2327,12 @@ static void bond_miimon_commit(struct bo
bond_miimon_link_change(bond, slave, BOND_LINK_UP);
@ -598,7 +598,7 @@
if (!bond->curr_active_slave || slave == primary)
goto do_failover;
@@ -2315,6 +2368,15 @@ do_failover:
@@ -2321,6 +2374,15 @@ do_failover:
}
bond_set_carrier(bond);
@ -614,7 +614,7 @@
}
/* bond_mii_monitor
@@ -4408,6 +4470,11 @@ static void bond_destructor(struct net_d
@@ -4414,6 +4476,11 @@ static void bond_destructor(struct net_d
struct bonding *bond = netdev_priv(bond_dev);
if (bond->wq)
destroy_workqueue(bond->wq);
@ -626,7 +626,7 @@
}
void bond_setup(struct net_device *bond_dev)
@@ -4961,6 +5028,16 @@ int bond_create(struct net *net, const c
@@ -4967,6 +5034,16 @@ int bond_create(struct net *net, const c
bond_work_init_all(bond);
rtnl_unlock();
@ -643,7 +643,7 @@
return 0;
}
@@ -5056,6 +5133,203 @@ static void __exit bonding_exit(void)
@@ -5062,6 +5139,203 @@ static void __exit bonding_exit(void)
#endif
}

2
target/linux/rockchip/patches-5.4/105-mmc-core-set-initial-signal-voltage-on-power-off.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1377,6 +1377,8 @@ void mmc_power_off(struct mmc_host *host
@@ -1380,6 +1380,8 @@ void mmc_power_off(struct mmc_host *host
mmc_pwrseq_power_off(host);