kernel: ipq806x: refresh a qca-nss patch to kernel 5.15.162

This commit is contained in:
Lucas Asvio
2024-07-17 12:45:28 +02:00
parent 4989565644
commit ec5c732214
3 changed files with 8 additions and 8 deletions

View File

@@ -530,7 +530,7 @@
+}; +};
--- a/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts --- a/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
+++ b/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts +++ b/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
@@ -311,10 +311,28 @@ @@ -312,10 +312,28 @@
0x00054 0xc832c832 /* LED_CTRL_1 */ 0x00054 0xc832c832 /* LED_CTRL_1 */
>; >;
}; };
@@ -559,7 +559,7 @@
phy-mode = "rgmii"; phy-mode = "rgmii";
qcom,id = <0>; qcom,id = <0>;
@@ -332,6 +350,16 @@ @@ -333,6 +351,16 @@
&gmac1 { &gmac1 {
status = "okay"; status = "okay";

View File

@@ -622,7 +622,7 @@
const struct in6_addr *daddr) const struct in6_addr *daddr)
--- a/net/ipv6/route.c --- a/net/ipv6/route.c
+++ b/net/ipv6/route.c +++ b/net/ipv6/route.c
@@ -3875,6 +3875,9 @@ out_free: @@ -3879,6 +3879,9 @@ out_free:
return ERR_PTR(err); return ERR_PTR(err);
} }
@@ -632,7 +632,7 @@
int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags, int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
@@ -3886,6 +3889,10 @@ int ip6_route_add(struct fib6_config *cf @@ -3890,6 +3893,10 @@ int ip6_route_add(struct fib6_config *cf
return PTR_ERR(rt); return PTR_ERR(rt);
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack); err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
@@ -643,7 +643,7 @@
fib6_info_release(rt); fib6_info_release(rt);
return err; return err;
@@ -3907,6 +3914,9 @@ static int __ip6_del_rt(struct fib6_info @@ -3911,6 +3918,9 @@ static int __ip6_del_rt(struct fib6_info
err = fib6_del(rt, info); err = fib6_del(rt, info);
spin_unlock_bh(&table->tb6_lock); spin_unlock_bh(&table->tb6_lock);
@@ -653,7 +653,7 @@
out: out:
fib6_info_release(rt); fib6_info_release(rt);
return err; return err;
@@ -6343,6 +6353,20 @@ static int ip6_route_dev_notify(struct n @@ -6350,6 +6360,20 @@ static int ip6_route_dev_notify(struct n
return NOTIFY_OK; return NOTIFY_OK;
} }

View File

@@ -59,7 +59,7 @@
/* caller should hold vxlan->hash_lock */ /* caller should hold vxlan->hash_lock */
static struct vxlan_rdst *vxlan_fdb_find_rdst(struct vxlan_fdb *f, static struct vxlan_rdst *vxlan_fdb_find_rdst(struct vxlan_fdb *f,
union vxlan_addr *ip, __be16 port, union vxlan_addr *ip, __be16 port,
@@ -2750,6 +2781,9 @@ static void vxlan_xmit_one(struct sk_buf @@ -2746,6 +2777,9 @@ static void vxlan_xmit_one(struct sk_buf
goto out_unlock; goto out_unlock;
} }
@@ -69,7 +69,7 @@
tos = ip_tunnel_ecn_encap(tos, old_iph, skb); tos = ip_tunnel_ecn_encap(tos, old_iph, skb);
ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); ttl = ttl ? : ip4_dst_hoplimit(&rt->dst);
err = vxlan_build_skb(skb, ndst, sizeof(struct iphdr), err = vxlan_build_skb(skb, ndst, sizeof(struct iphdr),
@@ -2821,6 +2855,9 @@ static void vxlan_xmit_one(struct sk_buf @@ -2817,6 +2851,9 @@ static void vxlan_xmit_one(struct sk_buf
if (err < 0) if (err < 0)
goto tx_error; goto tx_error;