mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.15 to 5.15.41 (#9412)
Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>
This commit is contained in:
parent
bc45671c00
commit
1787300141
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .40
|
LINUX_VERSION-5.15 = .41
|
||||||
LINUX_KERNEL_HASH-5.15.40 = c787f7eecbabbfca4dd3224827292a5fb98e3370c6e04b859714fba25bb8c33b
|
LINUX_KERNEL_HASH-5.15.41 = 3c7cb1fc3b029b1b765a33af9608b6f18f734246050640def019ee4c4ad6591e
|
||||||
|
@ -656,8 +656,8 @@
|
|||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
+#include <linux/in6.h>
|
+#include <linux/in6.h>
|
||||||
|
|
||||||
u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
|
u64 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
|
||||||
u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
|
u64 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
|
||||||
--- a/include/uapi/linux/in.h
|
--- a/include/uapi/linux/in.h
|
||||||
+++ b/include/uapi/linux/in.h
|
+++ b/include/uapi/linux/in.h
|
||||||
@@ -88,7 +88,7 @@ enum {
|
@@ -88,7 +88,7 @@ enum {
|
||||||
|
@ -1,56 +0,0 @@
|
|||||||
From f81d97cb646ab8b90fb181d66fccaf9589990de6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Matthew Hagan <mnhagan88@gmail.com>
|
|
||||||
Date: Sat, 30 Apr 2022 11:00:49 +0100
|
|
||||||
Subject: [PATCH v2] net: sfp: Add tx-fault workaround for Huawei MA5671A SFP
|
|
||||||
ONT
|
|
||||||
|
|
||||||
As noted elsewhere, various GPON SFP modules exhibit non-standard
|
|
||||||
TX-fault behaviour. In the tested case, the Huawei MA5671A, when used
|
|
||||||
in combination with a Marvell mv88e6085 switch, was found to
|
|
||||||
persistently assert TX-fault, resulting in the module being disabled.
|
|
||||||
|
|
||||||
This patch adds a quirk to ignore the SFP_F_TX_FAULT state, allowing the
|
|
||||||
module to function.
|
|
||||||
|
|
||||||
Change from v1: removal of erroneous return statment (Andrew Lunn)
|
|
||||||
|
|
||||||
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/net/phy/sfp.c | 12 +++++++++++-
|
|
||||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/drivers/net/phy/sfp.c
|
|
||||||
+++ b/drivers/net/phy/sfp.c
|
|
||||||
@@ -250,6 +250,7 @@ struct sfp {
|
|
||||||
struct sfp_eeprom_id id;
|
|
||||||
unsigned int module_power_mW;
|
|
||||||
unsigned int module_t_start_up;
|
|
||||||
+ bool tx_fault_ignore;
|
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_HWMON)
|
|
||||||
struct sfp_diag diag;
|
|
||||||
@@ -1945,6 +1946,12 @@ static int sfp_sm_mod_probe(struct sfp *
|
|
||||||
else
|
|
||||||
sfp->module_t_start_up = T_START_UP;
|
|
||||||
|
|
||||||
+ if (!memcmp(id.base.vendor_name, "HUAWEI ", 16) &&
|
|
||||||
+ !memcmp(id.base.vendor_pn, "MA5671A ", 16))
|
|
||||||
+ sfp->tx_fault_ignore = true;
|
|
||||||
+ else
|
|
||||||
+ sfp->tx_fault_ignore = false;
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2397,7 +2404,10 @@ static void sfp_check_state(struct sfp *
|
|
||||||
mutex_lock(&sfp->st_mutex);
|
|
||||||
state = sfp_get_state(sfp);
|
|
||||||
changed = state ^ sfp->state;
|
|
||||||
- changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
|
|
||||||
+ if (sfp->tx_fault_ignore)
|
|
||||||
+ changed &= SFP_F_PRESENT | SFP_F_LOS;
|
|
||||||
+ else
|
|
||||||
+ changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
|
|
||||||
|
|
||||||
for (i = 0; i < GPIO_MAX; i++)
|
|
||||||
if (changed & BIT(i))
|
|
@ -60,7 +60,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1149,7 +1149,7 @@ void phy_state_machine(struct work_struc
|
@@ -1154,7 +1154,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;
|
||||||
|
@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1149,7 +1152,10 @@ void phy_state_machine(struct work_struc
|
@@ -1154,7 +1157,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;
|
||||||
|
Loading…
Reference in New Issue
Block a user