mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-08 12:00:49 +00:00
kernel: bump 5.15 to 5.15.36
Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
This commit is contained in:
parent
4a8eaa5c7c
commit
c3569a70c6
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .35
|
LINUX_VERSION-5.15 = .36
|
||||||
LINUX_KERNEL_HASH-5.15.35 = 0a1a5ae2f30eb2b38215e59077f045aabd7f4e2857a881482f02ea48186105d8
|
LINUX_KERNEL_HASH-5.15.36 = 36345db17a937c197c72ca9c7f34c262b3a12f927c237ff7770193014e29c690
|
||||||
|
@ -785,7 +785,7 @@
|
|||||||
*sum = csum_fold(csum_partial(diff, sizeof(diff),
|
*sum = csum_fold(csum_partial(diff, sizeof(diff),
|
||||||
--- a/include/linux/etherdevice.h
|
--- a/include/linux/etherdevice.h
|
||||||
+++ b/include/linux/etherdevice.h
|
+++ b/include/linux/etherdevice.h
|
||||||
@@ -512,7 +512,7 @@ static inline bool is_etherdev_addr(cons
|
@@ -511,7 +511,7 @@ static inline bool is_etherdev_addr(cons
|
||||||
* @b: Pointer to Ethernet header
|
* @b: Pointer to Ethernet header
|
||||||
*
|
*
|
||||||
* Compare two Ethernet headers, returns 0 if equal.
|
* Compare two Ethernet headers, returns 0 if equal.
|
||||||
@ -794,7 +794,7 @@
|
|||||||
* aligned OR the platform can handle unaligned access. This is the
|
* aligned OR the platform can handle unaligned access. This is the
|
||||||
* case for all packets coming into netif_receive_skb or similar
|
* case for all packets coming into netif_receive_skb or similar
|
||||||
* entry points.
|
* entry points.
|
||||||
@@ -535,11 +535,12 @@ static inline unsigned long compare_ethe
|
@@ -534,11 +534,12 @@ static inline unsigned long compare_ethe
|
||||||
fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
|
fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
|
||||||
return fold;
|
return fold;
|
||||||
#else
|
#else
|
||||||
|
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
||||||
@@ -3325,6 +3327,7 @@ static int packet_create(struct net *net
|
@@ -3330,6 +3332,7 @@ static int packet_create(struct net *net
|
||||||
mutex_init(&po->pg_vec_lock);
|
mutex_init(&po->pg_vec_lock);
|
||||||
po->rollover = NULL;
|
po->rollover = NULL;
|
||||||
po->prot_hook.func = packet_rcv;
|
po->prot_hook.func = packet_rcv;
|
||||||
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
if (sock->type == SOCK_PACKET)
|
if (sock->type == SOCK_PACKET)
|
||||||
po->prot_hook.func = packet_rcv_spkt;
|
po->prot_hook.func = packet_rcv_spkt;
|
||||||
@@ -3966,6 +3969,16 @@ packet_setsockopt(struct socket *sock, i
|
@@ -3971,6 +3974,16 @@ packet_setsockopt(struct socket *sock, i
|
||||||
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
default:
|
default:
|
||||||
return -ENOPROTOOPT;
|
return -ENOPROTOOPT;
|
||||||
}
|
}
|
||||||
@@ -4022,6 +4035,13 @@ static int packet_getsockopt(struct sock
|
@@ -4027,6 +4040,13 @@ static int packet_getsockopt(struct sock
|
||||||
case PACKET_VNET_HDR:
|
case PACKET_VNET_HDR:
|
||||||
val = po->has_vnet_hdr;
|
val = po->has_vnet_hdr;
|
||||||
break;
|
break;
|
||||||
|
@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
case RTN_THROW:
|
case RTN_THROW:
|
||||||
case RTN_UNREACHABLE:
|
case RTN_UNREACHABLE:
|
||||||
default:
|
default:
|
||||||
@@ -4559,6 +4578,17 @@ static int ip6_pkt_prohibit_out(struct n
|
@@ -4560,6 +4579,17 @@ static int ip6_pkt_prohibit_out(struct n
|
||||||
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
|
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
/*
|
/*
|
||||||
* Allocate a dst for local (unicast / anycast) address.
|
* Allocate a dst for local (unicast / anycast) address.
|
||||||
*/
|
*/
|
||||||
@@ -5039,7 +5069,8 @@ static int rtm_to_fib6_config(struct sk_
|
@@ -5040,7 +5070,8 @@ static int rtm_to_fib6_config(struct sk_
|
||||||
if (rtm->rtm_type == RTN_UNREACHABLE ||
|
if (rtm->rtm_type == RTN_UNREACHABLE ||
|
||||||
rtm->rtm_type == RTN_BLACKHOLE ||
|
rtm->rtm_type == RTN_BLACKHOLE ||
|
||||||
rtm->rtm_type == RTN_PROHIBIT ||
|
rtm->rtm_type == RTN_PROHIBIT ||
|
||||||
@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
cfg->fc_flags |= RTF_REJECT;
|
cfg->fc_flags |= RTF_REJECT;
|
||||||
|
|
||||||
if (rtm->rtm_type == RTN_LOCAL)
|
if (rtm->rtm_type == RTN_LOCAL)
|
||||||
@@ -6292,6 +6323,8 @@ static int ip6_route_dev_notify(struct n
|
@@ -6293,6 +6324,8 @@ static int ip6_route_dev_notify(struct n
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||||
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
|
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
|
||||||
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
|
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
|
||||||
@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
||||||
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
||||||
#endif
|
#endif
|
||||||
@@ -6303,6 +6336,7 @@ static int ip6_route_dev_notify(struct n
|
@@ -6304,6 +6337,7 @@ static int ip6_route_dev_notify(struct n
|
||||||
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||||
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
||||||
@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -6494,6 +6528,8 @@ static int __net_init ip6_route_net_init
|
@@ -6495,6 +6529,8 @@ static int __net_init ip6_route_net_init
|
||||||
|
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||||
net->ipv6.fib6_has_custom_rules = false;
|
net->ipv6.fib6_has_custom_rules = false;
|
||||||
@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
|
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
|
||||||
sizeof(*net->ipv6.ip6_prohibit_entry),
|
sizeof(*net->ipv6.ip6_prohibit_entry),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
@@ -6504,11 +6540,21 @@ static int __net_init ip6_route_net_init
|
@@ -6505,11 +6541,21 @@ static int __net_init ip6_route_net_init
|
||||||
ip6_template_metrics, true);
|
ip6_template_metrics, true);
|
||||||
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
|
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
|
||||||
|
|
||||||
@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
||||||
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
||||||
ip6_template_metrics, true);
|
ip6_template_metrics, true);
|
||||||
@@ -6535,6 +6581,8 @@ out:
|
@@ -6536,6 +6582,8 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||||
@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
out_ip6_prohibit_entry:
|
out_ip6_prohibit_entry:
|
||||||
kfree(net->ipv6.ip6_prohibit_entry);
|
kfree(net->ipv6.ip6_prohibit_entry);
|
||||||
out_ip6_null_entry:
|
out_ip6_null_entry:
|
||||||
@@ -6554,6 +6602,7 @@ static void __net_exit ip6_route_net_exi
|
@@ -6555,6 +6603,7 @@ static void __net_exit ip6_route_net_exi
|
||||||
kfree(net->ipv6.ip6_null_entry);
|
kfree(net->ipv6.ip6_null_entry);
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||||
kfree(net->ipv6.ip6_prohibit_entry);
|
kfree(net->ipv6.ip6_prohibit_entry);
|
||||||
@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
kfree(net->ipv6.ip6_blk_hole_entry);
|
kfree(net->ipv6.ip6_blk_hole_entry);
|
||||||
#endif
|
#endif
|
||||||
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
||||||
@@ -6631,6 +6680,9 @@ void __init ip6_route_init_special_entri
|
@@ -6632,6 +6681,9 @@ void __init ip6_route_init_special_entri
|
||||||
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
||||||
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
|
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
|
||||||
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
static void qcom_scm_set_download_mode(bool enable)
|
static void qcom_scm_set_download_mode(bool enable)
|
||||||
{
|
{
|
||||||
bool avail;
|
bool avail;
|
||||||
@@ -1320,6 +1334,13 @@ static int qcom_scm_probe(struct platfor
|
@@ -1314,6 +1328,13 @@ static int qcom_scm_probe(struct platfor
|
||||||
if (download_mode)
|
if (download_mode)
|
||||||
qcom_scm_set_download_mode(true);
|
qcom_scm_set_download_mode(true);
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
@@ -577,6 +577,7 @@
|
@@ -558,6 +558,7 @@
|
||||||
compatible = "mediatek,mt7622-nor",
|
compatible = "mediatek,mt7622-nor",
|
||||||
"mediatek,mt8173-nor";
|
"mediatek,mt8173-nor";
|
||||||
reg = <0 0x11014000 0 0xe0>;
|
reg = <0 0x11014000 0 0xe0>;
|
||||||
|
@ -25,9 +25,9 @@ Link: https://lore.kernel.org/linux-mtd/20220127091808.1043392-6-miquel.raynal@b
|
|||||||
|
|
||||||
--- a/drivers/spi/spi-cadence-quadspi.c
|
--- a/drivers/spi/spi-cadence-quadspi.c
|
||||||
+++ b/drivers/spi/spi-cadence-quadspi.c
|
+++ b/drivers/spi/spi-cadence-quadspi.c
|
||||||
@@ -1230,10 +1230,7 @@ static bool cqspi_supports_mem_op(struct
|
@@ -1245,10 +1245,7 @@ static bool cqspi_supports_mem_op(struct
|
||||||
if (!(all_true || all_false))
|
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
- if (all_true)
|
- if (all_true)
|
||||||
- return spi_mem_dtr_supports_op(mem, op);
|
- return spi_mem_dtr_supports_op(mem, op);
|
||||||
|
@ -112,7 +112,7 @@ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
|
|||||||
|
|
||||||
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
@@ -940,6 +940,7 @@
|
@@ -941,6 +941,7 @@
|
||||||
clock-names = "hsdma";
|
clock-names = "hsdma";
|
||||||
power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>;
|
power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>;
|
||||||
#dma-cells = <1>;
|
#dma-cells = <1>;
|
||||||
|
@ -194,7 +194,7 @@ Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
|
|||||||
&pio {
|
&pio {
|
||||||
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
@@ -807,75 +807,83 @@
|
@@ -808,75 +808,83 @@
|
||||||
#reset-cells = <1>;
|
#reset-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
@@ -847,6 +847,12 @@
|
@@ -848,6 +848,12 @@
|
||||||
#address-cells = <0>;
|
#address-cells = <0>;
|
||||||
#interrupt-cells = <1>;
|
#interrupt-cells = <1>;
|
||||||
};
|
};
|
||||||
@ -13,7 +13,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
pcie1: pcie@1a145000 {
|
pcie1: pcie@1a145000 {
|
||||||
@@ -885,6 +891,12 @@
|
@@ -886,6 +892,12 @@
|
||||||
#address-cells = <0>;
|
#address-cells = <0>;
|
||||||
#interrupt-cells = <1>;
|
#interrupt-cells = <1>;
|
||||||
};
|
};
|
||||||
|
@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
||||||
@@ -835,6 +835,9 @@
|
@@ -836,6 +836,9 @@
|
||||||
bus-range = <0x00 0xff>;
|
bus-range = <0x00 0xff>;
|
||||||
ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x8000000>;
|
ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x8000000>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
#interrupt-cells = <1>;
|
#interrupt-cells = <1>;
|
||||||
interrupt-map-mask = <0 0 0 7>;
|
interrupt-map-mask = <0 0 0 7>;
|
||||||
@@ -879,6 +882,9 @@
|
@@ -880,6 +883,9 @@
|
||||||
bus-range = <0x00 0xff>;
|
bus-range = <0x00 0xff>;
|
||||||
ranges = <0x82000000 0 0x28000000 0x0 0x28000000 0 0x8000000>;
|
ranges = <0x82000000 0 0x28000000 0x0 0x28000000 0 0x8000000>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
--- a/drivers/net/ethernet/Kconfig
|
--- a/drivers/net/ethernet/Kconfig
|
||||||
+++ b/drivers/net/ethernet/Kconfig
|
+++ b/drivers/net/ethernet/Kconfig
|
||||||
@@ -162,6 +162,7 @@ source "drivers/net/ethernet/pasemi/Kcon
|
@@ -162,6 +162,7 @@ source "drivers/net/ethernet/pensando/Kc
|
||||||
source "drivers/net/ethernet/pensando/Kconfig"
|
|
||||||
source "drivers/net/ethernet/qlogic/Kconfig"
|
source "drivers/net/ethernet/qlogic/Kconfig"
|
||||||
|
source "drivers/net/ethernet/brocade/Kconfig"
|
||||||
source "drivers/net/ethernet/qualcomm/Kconfig"
|
source "drivers/net/ethernet/qualcomm/Kconfig"
|
||||||
+source "drivers/net/ethernet/ralink/Kconfig"
|
+source "drivers/net/ethernet/ralink/Kconfig"
|
||||||
source "drivers/net/ethernet/rdc/Kconfig"
|
source "drivers/net/ethernet/rdc/Kconfig"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user