mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
kernel: bump 5.10 to 5.10.177
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
parent
2122c80b32
commit
78a468f690
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.10 = .176
|
LINUX_VERSION-5.10 = .177
|
||||||
LINUX_KERNEL_HASH-5.10.176 = ce072c60ba04173e05b2a1de3fefdeba5ac8b28b1958d92d21bdbf9b736ef793
|
LINUX_KERNEL_HASH-5.10.177 = 9f2261fea804112dcec8fa2dcc26e9c1388aa9cb7f86e5913beb00b9b5a15571
|
||||||
|
@ -716,7 +716,7 @@ SVN-Revision: 35130
|
|||||||
struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh)
|
struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh)
|
||||||
--- a/net/netfilter/nf_conntrack_proto_tcp.c
|
--- a/net/netfilter/nf_conntrack_proto_tcp.c
|
||||||
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
|
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
|
||||||
@@ -415,7 +415,7 @@ static void tcp_sack(const struct sk_buf
|
@@ -412,7 +412,7 @@ static void tcp_sack(const struct sk_buf
|
||||||
|
|
||||||
/* Fast path for timestamp-only option */
|
/* Fast path for timestamp-only option */
|
||||||
if (length == TCPOLEN_TSTAMP_ALIGNED
|
if (length == TCPOLEN_TSTAMP_ALIGNED
|
||||||
|
@ -29,7 +29,7 @@ Submitted-by: DENG Qingfang <dqfext@gmail.com>
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -2709,6 +2709,9 @@ static int mv88e6xxx_setup_port(struct m
|
@@ -2714,6 +2714,9 @@ static int mv88e6xxx_setup_port(struct m
|
||||||
if (dsa_is_cpu_port(ds, port))
|
if (dsa_is_cpu_port(ds, port))
|
||||||
reg = 0;
|
reg = 0;
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--- a/kernel/sched/core.c
|
--- a/kernel/sched/core.c
|
||||||
+++ b/kernel/sched/core.c
|
+++ b/kernel/sched/core.c
|
||||||
@@ -3071,6 +3071,7 @@ int wake_up_state(struct task_struct *p,
|
@@ -3074,6 +3074,7 @@ int wake_up_state(struct task_struct *p,
|
||||||
{
|
{
|
||||||
return try_to_wake_up(p, state, 0);
|
return try_to_wake_up(p, state, 0);
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -2929,6 +2929,7 @@ static int mv88e6xxx_setup(struct dsa_sw
|
@@ -2934,6 +2934,7 @@ static int mv88e6xxx_setup(struct dsa_sw
|
||||||
|
|
||||||
chip->ds = ds;
|
chip->ds = ds;
|
||||||
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
|
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
|
||||||
|
@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -5498,6 +5498,7 @@ static int mv88e6xxx_register_switch(str
|
@@ -5503,6 +5503,7 @@ static int mv88e6xxx_register_switch(str
|
||||||
ds->ops = &mv88e6xxx_switch_ops;
|
ds->ops = &mv88e6xxx_switch_ops;
|
||||||
ds->ageing_time_min = chip->info->age_time_coeff;
|
ds->ageing_time_min = chip->info->age_time_coeff;
|
||||||
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
|
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
|
||||||
|
@ -16,7 +16,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
|
|
||||||
--- a/drivers/net/phy/phy.c
|
--- a/drivers/net/phy/phy.c
|
||||||
+++ b/drivers/net/phy/phy.c
|
+++ b/drivers/net/phy/phy.c
|
||||||
@@ -58,13 +58,13 @@ static const char *phy_state_to_str(enum
|
@@ -70,13 +70,13 @@ static void phy_process_state_change(str
|
||||||
|
|
||||||
static void phy_link_up(struct phy_device *phydev)
|
static void phy_link_up(struct phy_device *phydev)
|
||||||
{
|
{
|
||||||
@ -33,7 +33,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
phy_led_trigger_change_speed(phydev);
|
phy_led_trigger_change_speed(phydev);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -572,7 +572,7 @@ int phy_start_cable_test(struct phy_devi
|
@@ -584,7 +584,7 @@ int phy_start_cable_test(struct phy_devi
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/* Mark the carrier down until the test is complete */
|
/* Mark the carrier down until the test is complete */
|
||||||
@ -42,7 +42,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
|
|
||||||
netif_testing_on(dev);
|
netif_testing_on(dev);
|
||||||
err = phydev->drv->cable_test_start(phydev);
|
err = phydev->drv->cable_test_start(phydev);
|
||||||
@@ -643,7 +643,7 @@ int phy_start_cable_test_tdr(struct phy_
|
@@ -655,7 +655,7 @@ int phy_start_cable_test_tdr(struct phy_
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/* Mark the carrier down until the test is complete */
|
/* Mark the carrier down until the test is complete */
|
||||||
@ -51,7 +51,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
|
|
||||||
netif_testing_on(dev);
|
netif_testing_on(dev);
|
||||||
err = phydev->drv->cable_test_tdr_start(phydev, config);
|
err = phydev->drv->cable_test_tdr_start(phydev, config);
|
||||||
@@ -714,7 +714,7 @@ static int phy_check_link_status(struct
|
@@ -726,7 +726,7 @@ static int phy_check_link_status(struct
|
||||||
phy_link_up(phydev);
|
phy_link_up(phydev);
|
||||||
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
||||||
phydev->state = PHY_NOLINK;
|
phydev->state = PHY_NOLINK;
|
||||||
@ -60,7 +60,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1226,7 +1226,7 @@ void phy_state_machine(struct work_struc
|
@@ -1241,7 +1241,7 @@ void phy_state_machine(struct work_struc
|
||||||
case PHY_HALTED:
|
case PHY_HALTED:
|
||||||
if (phydev->link) {
|
if (phydev->link) {
|
||||||
phydev->link = 0;
|
phydev->link = 0;
|
||||||
|
@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
|
|
||||||
--- a/drivers/net/phy/phy.c
|
--- a/drivers/net/phy/phy.c
|
||||||
+++ b/drivers/net/phy/phy.c
|
+++ b/drivers/net/phy/phy.c
|
||||||
@@ -714,7 +714,10 @@ static int phy_check_link_status(struct
|
@@ -726,7 +726,10 @@ static int phy_check_link_status(struct
|
||||||
phy_link_up(phydev);
|
phy_link_up(phydev);
|
||||||
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
||||||
phydev->state = PHY_NOLINK;
|
phydev->state = PHY_NOLINK;
|
||||||
@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1226,7 +1229,10 @@ void phy_state_machine(struct work_struc
|
@@ -1241,7 +1244,10 @@ void phy_state_machine(struct work_struc
|
||||||
case PHY_HALTED:
|
case PHY_HALTED:
|
||||||
if (phydev->link) {
|
if (phydev->link) {
|
||||||
phydev->link = 0;
|
phydev->link = 0;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/usb/dwc2/platform.c
|
--- a/drivers/usb/dwc2/platform.c
|
||||||
+++ b/drivers/usb/dwc2/platform.c
|
+++ b/drivers/usb/dwc2/platform.c
|
||||||
@@ -477,6 +477,12 @@ static int dwc2_driver_probe(struct plat
|
@@ -465,6 +465,12 @@ static int dwc2_driver_probe(struct plat
|
||||||
if (retval)
|
if (retval)
|
||||||
return retval;
|
return retval;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user