From a4c06e081fe238a243ffbf992badcddb36c3a40f Mon Sep 17 00:00:00 2001 From: Lucas Asvio Date: Mon, 17 Feb 2025 21:13:07 +0100 Subject: [PATCH] kernel: ipq806x: refresh qca-nss patches to kernel 5.15.173 --- .../999-100-qca-nss-ecm-support-CORE.patch | 12 ++++++------ .../999-200-qca-nss-drv-qdisc-support.patch | 4 ++-- .../999-201-qca-nss-clients-qdisc-support.patch | 4 ++-- .../999-204-qca-nss-clients-iptunnel-support.patch | 2 +- .../patches-5.15/999-300-qca-mcs-support.patch | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/target/linux/ipq806x/patches-5.15/999-100-qca-nss-ecm-support-CORE.patch b/target/linux/ipq806x/patches-5.15/999-100-qca-nss-ecm-support-CORE.patch index f1b2900877..62c80d5612 100644 --- a/target/linux/ipq806x/patches-5.15/999-100-qca-nss-ecm-support-CORE.patch +++ b/target/linux/ipq806x/patches-5.15/999-100-qca-nss-ecm-support-CORE.patch @@ -561,7 +561,7 @@ return 0; out_remove_new_fa: -@@ -1769,6 +1775,9 @@ int fib_table_delete(struct net *net, st +@@ -1766,6 +1772,9 @@ int fib_table_delete(struct net *net, st if (fa_to_delete->fa_state & FA_S_ACCESSED) rt_cache_flush(cfg->fc_nlinfo.nl_net); @@ -571,7 +571,7 @@ fib_release_info(fa_to_delete->fa_info); alias_free_mem_rcu(fa_to_delete); return 0; -@@ -2401,6 +2410,20 @@ void __init fib_trie_init(void) +@@ -2398,6 +2407,20 @@ void __init fib_trie_init(void) 0, SLAB_PANIC | SLAB_ACCOUNT, NULL); } @@ -622,7 +622,7 @@ const struct in6_addr *daddr) --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -3879,6 +3879,9 @@ out_free: +@@ -3867,6 +3867,9 @@ out_free: return ERR_PTR(err); } @@ -632,7 +632,7 @@ int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags, struct netlink_ext_ack *extack) { -@@ -3890,6 +3893,10 @@ int ip6_route_add(struct fib6_config *cf +@@ -3878,6 +3881,10 @@ int ip6_route_add(struct fib6_config *cf return PTR_ERR(rt); err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack); @@ -643,7 +643,7 @@ fib6_info_release(rt); return err; -@@ -3911,6 +3918,9 @@ static int __ip6_del_rt(struct fib6_info +@@ -3899,6 +3906,9 @@ static int __ip6_del_rt(struct fib6_info err = fib6_del(rt, info); spin_unlock_bh(&table->tb6_lock); @@ -653,7 +653,7 @@ out: fib6_info_release(rt); return err; -@@ -6350,6 +6360,20 @@ static int ip6_route_dev_notify(struct n +@@ -6338,6 +6348,20 @@ static int ip6_route_dev_notify(struct n return NOTIFY_OK; } diff --git a/target/linux/ipq806x/patches-5.15/999-200-qca-nss-drv-qdisc-support.patch b/target/linux/ipq806x/patches-5.15/999-200-qca-nss-drv-qdisc-support.patch index 32de66d465..85d0db04c8 100644 --- a/target/linux/ipq806x/patches-5.15/999-200-qca-nss-drv-qdisc-support.patch +++ b/target/linux/ipq806x/patches-5.15/999-200-qca-nss-drv-qdisc-support.patch @@ -1,6 +1,6 @@ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -689,6 +689,7 @@ typedef unsigned char *sk_buff_data_t; +@@ -687,6 +687,7 @@ typedef unsigned char *sk_buff_data_t; * @offload_fwd_mark: Packet was L2-forwarded in hardware * @offload_l3_fwd_mark: Packet was L3-forwarded in hardware * @tc_skip_classify: do not classify packet. set by IFB device @@ -8,7 +8,7 @@ * @tc_at_ingress: used within tc_classify to distinguish in/egress * @redirected: packet was redirected by packet classifier * @from_ingress: packet was redirected from the ingress path -@@ -905,6 +906,8 @@ struct sk_buff { +@@ -900,6 +901,8 @@ struct sk_buff { #ifdef CONFIG_NET_CLS_ACT __u8 tc_skip_classify:1; __u8 tc_at_ingress:1; diff --git a/target/linux/ipq806x/patches-5.15/999-201-qca-nss-clients-qdisc-support.patch b/target/linux/ipq806x/patches-5.15/999-201-qca-nss-clients-qdisc-support.patch index 0d6fa0e77f..6c05aee791 100644 --- a/target/linux/ipq806x/patches-5.15/999-201-qca-nss-clients-qdisc-support.patch +++ b/target/linux/ipq806x/patches-5.15/999-201-qca-nss-clients-qdisc-support.patch @@ -333,7 +333,7 @@ #endif --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -2351,4 +2351,26 @@ static int __init pktsched_init(void) +@@ -2356,4 +2356,26 @@ static int __init pktsched_init(void) return 0; } @@ -430,7 +430,7 @@ /* Reset all TX qdiscs greater than index of a device. */ static inline void qdisc_reset_all_tx_gt(struct net_device *dev, unsigned int i) { -@@ -1342,4 +1377,9 @@ static inline void qdisc_synchronize(con +@@ -1341,4 +1376,9 @@ static inline void qdisc_synchronize(con msleep(1); } diff --git a/target/linux/ipq806x/patches-5.15/999-204-qca-nss-clients-iptunnel-support.patch b/target/linux/ipq806x/patches-5.15/999-204-qca-nss-clients-iptunnel-support.patch index 18f416aa62..be93c1da6f 100644 --- a/target/linux/ipq806x/patches-5.15/999-204-qca-nss-clients-iptunnel-support.patch +++ b/target/linux/ipq806x/patches-5.15/999-204-qca-nss-clients-iptunnel-support.patch @@ -10,7 +10,7 @@ __u32 flags; /* tunnel flags */ --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h -@@ -567,4 +567,9 @@ static inline void ip_tunnel_info_opts_s +@@ -575,4 +575,9 @@ static inline void ip_tunnel_info_opts_s #endif /* CONFIG_INET */ diff --git a/target/linux/ipq806x/patches-5.15/999-300-qca-mcs-support.patch b/target/linux/ipq806x/patches-5.15/999-300-qca-mcs-support.patch index d3c10cca45..12f9f73cd1 100644 --- a/target/linux/ipq806x/patches-5.15/999-300-qca-mcs-support.patch +++ b/target/linux/ipq806x/patches-5.15/999-300-qca-mcs-support.patch @@ -88,7 +88,7 @@ MODULE_LICENSE("GPL"); --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c -@@ -82,6 +82,12 @@ netdev_tx_t br_dev_xmit(struct sk_buff * +@@ -87,6 +87,12 @@ netdev_tx_t br_dev_xmit(struct sk_buff * if (is_broadcast_ether_addr(dest)) { br_flood(br, skb, BR_PKT_BROADCAST, false, true); } else if (is_multicast_ether_addr(dest)) {