forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.147 Manually rebased: generic/backport-5.15/005-v5.17-01-Kbuild-use-Wdeclaration-after-statement.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <[email protected]> (cherry picked from commit 3891355) [Refresh on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens <[email protected]>
- Loading branch information
Showing
11 changed files
with
30 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-5.15 = .146 | ||
LINUX_KERNEL_HASH-5.15.146 = 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192 | ||
LINUX_VERSION-5.15 = .147 | ||
LINUX_KERNEL_HASH-5.15.147 = 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c | ||
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c | ||
@@ -2616,7 +2616,7 @@ static void bcmgenet_init_tx_ring(struct | ||
@@ -2618,7 +2618,7 @@ static void bcmgenet_init_tx_ring(struct | ||
|
||
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX); | ||
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX); | ||
|
@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
/* Disable rate control for now */ | ||
bcmgenet_tdma_ring_writel(priv, index, flow_period_val, | ||
TDMA_FLOW_PERIOD); | ||
@@ -4084,9 +4084,12 @@ static int bcmgenet_probe(struct platfor | ||
@@ -4086,9 +4086,12 @@ static int bcmgenet_probe(struct platfor | ||
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); | ||
|
||
/* Set default coalescing parameters */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
static inline void bcmgenet_writel(u32 value, void __iomem *offset) | ||
{ | ||
@@ -2447,6 +2450,11 @@ static void reset_umac(struct bcmgenet_p | ||
@@ -2449,6 +2452,11 @@ static void reset_umac(struct bcmgenet_p | ||
bcmgenet_rbuf_ctrl_set(priv, 0); | ||
udelay(10); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c | ||
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c | ||
@@ -3265,7 +3265,7 @@ static void bcmgenet_get_hw_addr(struct | ||
@@ -3267,7 +3267,7 @@ static void bcmgenet_get_hw_addr(struct | ||
} | ||
|
||
/* Returns a reusable dma control register value */ | ||
|
@@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
{ | ||
unsigned int i; | ||
u32 reg; | ||
@@ -3290,6 +3290,14 @@ static u32 bcmgenet_dma_disable(struct b | ||
@@ -3292,6 +3292,14 @@ static u32 bcmgenet_dma_disable(struct b | ||
udelay(10); | ||
bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH); | ||
|
||
|
@@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
return dma_ctrl; | ||
} | ||
|
||
@@ -3353,8 +3361,8 @@ static int bcmgenet_open(struct net_devi | ||
@@ -3355,8 +3363,8 @@ static int bcmgenet_open(struct net_devi | ||
|
||
bcmgenet_set_hw_addr(priv, dev->dev_addr); | ||
|
||
|
@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
/* Reinitialize TDMA and RDMA and SW housekeeping */ | ||
ret = bcmgenet_init_dma(priv); | ||
@@ -4213,7 +4221,7 @@ static int bcmgenet_resume(struct device | ||
@@ -4215,7 +4223,7 @@ static int bcmgenet_resume(struct device | ||
bcmgenet_hfb_create_rxnfc_filter(priv, rule); | ||
|
||
/* Disable RX/TX DMA and flush TX queues */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/mmc/core/block.c | ||
+++ b/drivers/mmc/core/block.c | ||
@@ -1888,7 +1888,11 @@ static void mmc_blk_mq_rw_recovery(struc | ||
@@ -1890,7 +1890,11 @@ static void mmc_blk_mq_rw_recovery(struc | ||
return; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
||
--- a/drivers/net/usb/ax88179_178a.c | ||
+++ b/drivers/net/usb/ax88179_178a.c | ||
@@ -1363,11 +1363,12 @@ static int ax88179_bind(struct usbnet *d | ||
@@ -1333,11 +1333,12 @@ static int ax88179_bind(struct usbnet *d | ||
dev->mii.phy_id = 0x03; | ||
dev->mii.supports_gmii = 1; | ||
|
||
|
@@ -33,9 +33,9 @@ Signed-off-by: David S. Miller <[email protected]> | |
+ | ||
+ netif_set_gso_max_size(dev->net, 16384); | ||
|
||
/* Enable checksum offload */ | ||
*tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP | | ||
@@ -1573,17 +1574,19 @@ ax88179_tx_fixup(struct usbnet *dev, str | ||
ax88179_reset(dev); | ||
|
||
@@ -1507,17 +1508,19 @@ ax88179_tx_fixup(struct usbnet *dev, str | ||
{ | ||
u32 tx_hdr1, tx_hdr2; | ||
int frame_size = dev->maxpacket; | ||
|
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
if ((skb_header_cloned(skb) || headroom < 0) && | ||
pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) { | ||
dev_kfree_skb_any(skb); | ||
@@ -1594,6 +1597,8 @@ ax88179_tx_fixup(struct usbnet *dev, str | ||
@@ -1528,6 +1531,8 @@ ax88179_tx_fixup(struct usbnet *dev, str | ||
put_unaligned_le32(tx_hdr1, ptr); | ||
put_unaligned_le32(tx_hdr2, ptr + 4); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -77,7 +77,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *, | ||
u32)); | ||
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *, | ||
@@ -1987,9 +2001,11 @@ static void __sk_free(struct sock *sk) | ||
@@ -1994,9 +2008,11 @@ static void __sk_free(struct sock *sk) | ||
if (likely(sk->sk_net_refcnt)) | ||
sock_inuse_add(sock_net(sk), -1); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/core/sock.c | ||
+++ b/net/core/sock.c | ||
@@ -3881,6 +3881,8 @@ static __net_initdata struct pernet_oper | ||
@@ -3889,6 +3889,8 @@ static __net_initdata struct pernet_oper | ||
|
||
static int __init proto_init(void) | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
case RTN_THROW: | ||
case RTN_UNREACHABLE: | ||
default: | ||
@@ -4560,6 +4579,17 @@ static int ip6_pkt_prohibit_out(struct n | ||
@@ -4557,6 +4576,17 @@ static int ip6_pkt_prohibit_out(struct n | ||
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); | ||
} | ||
|
||
|
@@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
/* | ||
* Allocate a dst for local (unicast / anycast) address. | ||
*/ | ||
@@ -5047,7 +5077,8 @@ static int rtm_to_fib6_config(struct sk_ | ||
@@ -5044,7 +5074,8 @@ static int rtm_to_fib6_config(struct sk_ | ||
if (rtm->rtm_type == RTN_UNREACHABLE || | ||
rtm->rtm_type == RTN_BLACKHOLE || | ||
rtm->rtm_type == RTN_PROHIBIT || | ||
|
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
cfg->fc_flags |= RTF_REJECT; | ||
|
||
if (rtm->rtm_type == RTN_LOCAL) | ||
@@ -6301,6 +6332,8 @@ static int ip6_route_dev_notify(struct n | ||
@@ -6298,6 +6329,8 @@ static int ip6_route_dev_notify(struct n | ||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
net->ipv6.ip6_prohibit_entry->dst.dev = dev; | ||
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); | ||
|
@@ -194,15 +194,15 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
net->ipv6.ip6_blk_hole_entry->dst.dev = dev; | ||
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); | ||
#endif | ||
@@ -6312,6 +6345,7 @@ static int ip6_route_dev_notify(struct n | ||
@@ -6309,6 +6342,7 @@ static int ip6_route_dev_notify(struct n | ||
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); | ||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); | ||
+ in6_dev_put_clear(&net->ipv6.ip6_policy_failed_entry->rt6i_idev); | ||
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); | ||
#endif | ||
} | ||
@@ -6503,6 +6537,8 @@ static int __net_init ip6_route_net_init | ||
@@ -6500,6 +6534,8 @@ static int __net_init ip6_route_net_init | ||
|
||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
net->ipv6.fib6_has_custom_rules = false; | ||
|
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, | ||
sizeof(*net->ipv6.ip6_prohibit_entry), | ||
GFP_KERNEL); | ||
@@ -6513,11 +6549,21 @@ static int __net_init ip6_route_net_init | ||
@@ -6510,11 +6546,21 @@ static int __net_init ip6_route_net_init | ||
ip6_template_metrics, true); | ||
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached); | ||
|
||
|
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; | ||
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, | ||
ip6_template_metrics, true); | ||
@@ -6544,6 +6590,8 @@ out: | ||
@@ -6541,6 +6587,8 @@ out: | ||
return ret; | ||
|
||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
|
@@ -243,15 +243,15 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
out_ip6_prohibit_entry: | ||
kfree(net->ipv6.ip6_prohibit_entry); | ||
out_ip6_null_entry: | ||
@@ -6563,6 +6611,7 @@ static void __net_exit ip6_route_net_exi | ||
@@ -6560,6 +6608,7 @@ static void __net_exit ip6_route_net_exi | ||
kfree(net->ipv6.ip6_null_entry); | ||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
kfree(net->ipv6.ip6_prohibit_entry); | ||
+ kfree(net->ipv6.ip6_policy_failed_entry); | ||
kfree(net->ipv6.ip6_blk_hole_entry); | ||
#endif | ||
dst_entries_destroy(&net->ipv6.ip6_dst_ops); | ||
@@ -6646,6 +6695,9 @@ void __init ip6_route_init_special_entri | ||
@@ -6643,6 +6692,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_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); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/netfilter/nf_tables_api.c | ||
+++ b/net/netfilter/nf_tables_api.c | ||
@@ -7709,7 +7709,7 @@ static int nft_register_flowtable_net_ho | ||
@@ -7736,7 +7736,7 @@ static int nft_register_flowtable_net_ho | ||
err = flowtable->data.type->setup(&flowtable->data, | ||
hook->ops.dev, | ||
FLOW_BLOCK_BIND); | ||
|