mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 6.6 to 6.6.57 (#12556)
This commit is contained in:
parent
f1b0e6c52e
commit
e325c0a2db
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.6 = .56
|
LINUX_VERSION-6.6 = .57
|
||||||
LINUX_KERNEL_HASH-6.6.56 = f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95
|
LINUX_KERNEL_HASH-6.6.57 = 66ce426ef96f99b8e1ef7ac72e780c730ef8b970f7aa5708501c4274d7abb7b3
|
||||||
|
@ -0,0 +1,43 @@
|
|||||||
|
Subject: [PATCH v2] netfilter: xtables: fix typo causing some targets to not load on IPv6
|
||||||
|
Date: Sat, 19 Oct 2024 08:05:07 +0300 [thread overview]
|
||||||
|
Message-ID: <20241019-xtables-typos-v2-1-6b8b1735dc8e@0upti.me> (raw)
|
||||||
|
|
||||||
|
These were added with the wrong family in 4cdc55e, which seems
|
||||||
|
to just have been a typo, but now ip6tables rules with --set-mark
|
||||||
|
don't work anymore, which is pretty bad.
|
||||||
|
|
||||||
|
Fixes: 0bfcb7b71e73 ("netfilter: xtables: avoid NFPROTO_UNSPEC where needed")
|
||||||
|
Reviewed-by: Phil Sutter <phil@nwl.cc>
|
||||||
|
Signed-off-by: Ilya Katsnelson <me@0upti.me>
|
||||||
|
---
|
||||||
|
Changes in v2:
|
||||||
|
- Fixed a typo in the commit message (that's karma).
|
||||||
|
- Replaced a reference to backport commit.
|
||||||
|
- Link to v1: https://lore.kernel.org/r/20241018-xtables-typos-v1-1-02a51789c0ec@0upti.me
|
||||||
|
---
|
||||||
|
net/netfilter/xt_NFLOG.c | 2 +-
|
||||||
|
net/netfilter/xt_mark.c | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
--- a/net/netfilter/xt_NFLOG.c
|
||||||
|
+++ b/net/netfilter/xt_NFLOG.c
|
||||||
|
@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] _
|
||||||
|
{
|
||||||
|
.name = "NFLOG",
|
||||||
|
.revision = 0,
|
||||||
|
- .family = NFPROTO_IPV4,
|
||||||
|
+ .family = NFPROTO_IPV6,
|
||||||
|
.checkentry = nflog_tg_check,
|
||||||
|
.destroy = nflog_tg_destroy,
|
||||||
|
.target = nflog_tg,
|
||||||
|
--- a/net/netfilter/xt_mark.c
|
||||||
|
+++ b/net/netfilter/xt_mark.c
|
||||||
|
@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __
|
||||||
|
{
|
||||||
|
.name = "MARK",
|
||||||
|
.revision = 2,
|
||||||
|
- .family = NFPROTO_IPV4,
|
||||||
|
+ .family = NFPROTO_IPV6,
|
||||||
|
.target = mark_tg,
|
||||||
|
.targetsize = sizeof(struct xt_mark_tginfo2),
|
||||||
|
.me = THIS_MODULE,
|
@ -28,7 +28,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||||||
|
|
||||||
--- a/drivers/net/phy/phy_device.c
|
--- a/drivers/net/phy/phy_device.c
|
||||||
+++ b/drivers/net/phy/phy_device.c
|
+++ b/drivers/net/phy/phy_device.c
|
||||||
@@ -3201,6 +3201,7 @@ static int of_phy_led(struct phy_device
|
@@ -3202,6 +3202,7 @@ static int of_phy_led(struct phy_device
|
||||||
struct device *dev = &phydev->mdio.dev;
|
struct device *dev = &phydev->mdio.dev;
|
||||||
struct led_init_data init_data = {};
|
struct led_init_data init_data = {};
|
||||||
struct led_classdev *cdev;
|
struct led_classdev *cdev;
|
||||||
@ -36,7 +36,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||||||
struct phy_led *phyled;
|
struct phy_led *phyled;
|
||||||
u32 index;
|
u32 index;
|
||||||
int err;
|
int err;
|
||||||
@@ -3218,6 +3219,21 @@ static int of_phy_led(struct phy_device
|
@@ -3219,6 +3220,21 @@ static int of_phy_led(struct phy_device
|
||||||
if (index > U8_MAX)
|
if (index > U8_MAX)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -2283,6 +2283,7 @@ CONFIG_HARDEN_BRANCH_HISTORY=y
|
|||||||
# CONFIG_HID_MAGICMOUSE is not set
|
# CONFIG_HID_MAGICMOUSE is not set
|
||||||
# CONFIG_HID_MALTRON is not set
|
# CONFIG_HID_MALTRON is not set
|
||||||
# CONFIG_HID_MAYFLASH is not set
|
# CONFIG_HID_MAYFLASH is not set
|
||||||
|
# CONFIG_HID_MCP2200 is not set
|
||||||
# CONFIG_HID_MCP2221 is not set
|
# CONFIG_HID_MCP2221 is not set
|
||||||
# CONFIG_HID_MEGAWORLD_FF is not set
|
# CONFIG_HID_MEGAWORLD_FF is not set
|
||||||
# CONFIG_HID_MICROSOFT is not set
|
# CONFIG_HID_MICROSOFT is not set
|
||||||
|
@ -195,20 +195,37 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|||||||
|
|
||||||
return connmark_tg_shift(skb, info);
|
return connmark_tg_shift(skb, info);
|
||||||
}
|
}
|
||||||
@@ -167,6 +194,16 @@ static struct xt_target connmark_tg_reg[
|
@@ -168,6 +195,16 @@ static struct xt_target connmark_tg_reg[
|
||||||
.targetsize = sizeof(struct xt_connmark_tginfo2),
|
|
||||||
.destroy = connmark_tg_destroy,
|
.destroy = connmark_tg_destroy,
|
||||||
.me = THIS_MODULE,
|
.me = THIS_MODULE,
|
||||||
+ },
|
},
|
||||||
+ {
|
+ {
|
||||||
+ .name = "CONNMARK",
|
+ .name = "CONNMARK",
|
||||||
+ .revision = 3,
|
+ .revision = 3,
|
||||||
+ .family = NFPROTO_UNSPEC,
|
+ .family = NFPROTO_IPV4,
|
||||||
+ .checkentry = connmark_tg_check,
|
+ .checkentry = connmark_tg_check,
|
||||||
+ .target = connmark_tg_v3,
|
+ .target = connmark_tg_v3,
|
||||||
+ .targetsize = sizeof(struct xt_connmark_tginfo3),
|
+ .targetsize = sizeof(struct xt_connmark_tginfo3),
|
||||||
+ .destroy = connmark_tg_destroy,
|
+ .destroy = connmark_tg_destroy,
|
||||||
+ .me = THIS_MODULE,
|
+ .me = THIS_MODULE,
|
||||||
}
|
+ },
|
||||||
|
#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
|
||||||
|
{
|
||||||
|
.name = "CONNMARK",
|
||||||
|
@@ -189,6 +226,16 @@ static struct xt_target connmark_tg_reg[
|
||||||
|
.destroy = connmark_tg_destroy,
|
||||||
|
.me = THIS_MODULE,
|
||||||
|
},
|
||||||
|
+ {
|
||||||
|
+ .name = "CONNMARK",
|
||||||
|
+ .revision = 3,
|
||||||
|
+ .family = NFPROTO_IPV6,
|
||||||
|
+ .checkentry = connmark_tg_check,
|
||||||
|
+ .target = connmark_tg_v3,
|
||||||
|
+ .targetsize = sizeof(struct xt_connmark_tginfo3),
|
||||||
|
+ .destroy = connmark_tg_destroy,
|
||||||
|
+ .me = THIS_MODULE,
|
||||||
|
+ },
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
struct rtnl_link {
|
struct rtnl_link {
|
||||||
rtnl_doit_func doit;
|
rtnl_doit_func doit;
|
||||||
@@ -4949,7 +4949,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
@@ -4978,7 +4978,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
|
@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
|
|
||||||
--- a/drivers/usb/dwc3/core.c
|
--- a/drivers/usb/dwc3/core.c
|
||||||
+++ b/drivers/usb/dwc3/core.c
|
+++ b/drivers/usb/dwc3/core.c
|
||||||
@@ -839,8 +839,20 @@ static int dwc3_clk_enable(struct dwc3 *
|
@@ -845,8 +845,20 @@ static int dwc3_clk_enable(struct dwc3 *
|
||||||
if (ret)
|
if (ret)
|
||||||
goto disable_ref_clk;
|
goto disable_ref_clk;
|
||||||
|
|
||||||
@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
disable_ref_clk:
|
disable_ref_clk:
|
||||||
clk_disable_unprepare(dwc->ref_clk);
|
clk_disable_unprepare(dwc->ref_clk);
|
||||||
disable_bus_clk:
|
disable_bus_clk:
|
||||||
@@ -850,6 +862,8 @@ disable_bus_clk:
|
@@ -856,6 +868,8 @@ disable_bus_clk:
|
||||||
|
|
||||||
static void dwc3_clk_disable(struct dwc3 *dwc)
|
static void dwc3_clk_disable(struct dwc3 *dwc)
|
||||||
{
|
{
|
||||||
@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
clk_disable_unprepare(dwc->susp_clk);
|
clk_disable_unprepare(dwc->susp_clk);
|
||||||
clk_disable_unprepare(dwc->ref_clk);
|
clk_disable_unprepare(dwc->ref_clk);
|
||||||
clk_disable_unprepare(dwc->bus_clk);
|
clk_disable_unprepare(dwc->bus_clk);
|
||||||
@@ -1878,6 +1892,20 @@ static int dwc3_get_clocks(struct dwc3 *
|
@@ -1884,6 +1898,20 @@ static int dwc3_get_clocks(struct dwc3 *
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user