if (dev == ip6n->fb_tnl_dev)
RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
else
-@@ -790,6 +815,107 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
+@@ -795,6 +820,107 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
}
EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
const struct tnl_ptk_info *tpi,
struct metadata_dst *tun_dst,
-@@ -855,6 +981,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
+@@ -860,6 +986,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
__skb_tunnel_rx(skb, tunnel->dev, tunnel->net);
err = dscp_ecn_decapsulate(tunnel, ipv6h, skb);
-@@ -1004,6 +1151,7 @@ static void init_tel_txopt(struct ipv6_t
+@@ -1009,6 +1156,7 @@ static void init_tel_txopt(struct ipv6_t
opt->ops.opt_nflen = 8;
}
/**
* ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
* @t: the outgoing tunnel device
-@@ -1293,6 +1441,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1298,6 +1446,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
u8 protocol)
{
struct ip6_tnl *t = netdev_priv(dev);
struct ipv6hdr *ipv6h;
const struct iphdr *iph;
int encap_limit = -1;
-@@ -1392,6 +1541,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1397,6 +1546,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield);
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
return -1;
-@@ -1545,6 +1706,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+@@ -1550,6 +1711,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
t->parms.link = p->link;
t->parms.proto = p->proto;
t->parms.fwmark = p->fwmark;
dst_cache_reset(&t->dst_cache);
ip6_tnl_link_config(t);
}
-@@ -1590,6 +1759,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+@@ -1595,6 +1764,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
p->flowinfo = u->flowinfo;
p->link = u->link;
p->proto = u->proto;
memcpy(p->name, u->name, sizeof(u->name));
}
-@@ -1973,6 +2143,15 @@ static int ip6_tnl_validate(struct nlatt
+@@ -1978,6 +2148,15 @@ static int ip6_tnl_validate(struct nlatt
return 0;
}
static void ip6_tnl_netlink_parms(struct nlattr *data[],
struct __ip6_tnl_parm *parms)
{
-@@ -2010,6 +2189,46 @@ static void ip6_tnl_netlink_parms(struct
+@@ -2015,6 +2194,46 @@ static void ip6_tnl_netlink_parms(struct
if (data[IFLA_IPTUN_FWMARK])
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
}
static int ip6_tnl_newlink(struct net_device *dev,
-@@ -2118,6 +2337,12 @@ static void ip6_tnl_dellink(struct net_d
+@@ -2123,6 +2342,12 @@ static void ip6_tnl_dellink(struct net_d
static size_t ip6_tnl_get_size(const struct net_device *dev)
{
return
/* IFLA_IPTUN_LINK */
nla_total_size(4) +
-@@ -2147,6 +2372,24 @@ static size_t ip6_tnl_get_size(const str
+@@ -2152,6 +2377,24 @@ static size_t ip6_tnl_get_size(const str
nla_total_size(0) +
/* IFLA_IPTUN_FWMARK */
nla_total_size(4) +
0;
}
-@@ -2154,6 +2397,9 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2159,6 +2402,9 @@ static int ip6_tnl_fill_info(struct sk_b
{
struct ip6_tnl *tunnel = netdev_priv(dev);
struct __ip6_tnl_parm *parm = &tunnel->parms;
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
-@@ -2163,9 +2409,27 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2168,9 +2414,27 @@ static int ip6_tnl_fill_info(struct sk_b
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
-@@ -2205,6 +2469,7 @@ static const struct nla_policy ip6_tnl_p
+@@ -2210,6 +2474,7 @@ static const struct nla_policy ip6_tnl_p
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG },
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },
+++ /dev/null
-From ef57412d070fe663a66a5473ffc708bd89671259 Mon Sep 17 00:00:00 2001
-From: Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
-Date: Sun, 2 Feb 2025 17:10:14 +0800
-Subject: [PATCH] mips: ralink: update CPU clock index
-
-Some clock indexes have been reorganized in commit d34db686a3d7
-("clk: ralink: mtmips: fix clocks probe order in oldest ralink SoCs").
-Update CPU clock index to match the clock driver changes.
-
-Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
-Co-authored-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
----
- arch/mips/ralink/clk.c | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
---- a/arch/mips/ralink/clk.c
-+++ b/arch/mips/ralink/clk.c
-@@ -19,27 +19,22 @@
-
- static const char *clk_cpu(int *idx)
- {
-+ *idx = 1;
-+
- switch (ralink_soc) {
- case RT2880_SOC:
-- *idx = 0;
- return "ralink,rt2880-sysc";
- case RT3883_SOC:
-- *idx = 0;
- return "ralink,rt3883-sysc";
- case RT305X_SOC_RT3050:
-- *idx = 0;
- return "ralink,rt3050-sysc";
- case RT305X_SOC_RT3052:
-- *idx = 0;
- return "ralink,rt3052-sysc";
- case RT305X_SOC_RT3350:
-- *idx = 1;
- return "ralink,rt3350-sysc";
- case RT305X_SOC_RT3352:
-- *idx = 1;
- return "ralink,rt3352-sysc";
- case RT305X_SOC_RT5350:
-- *idx = 1;
- return "ralink,rt5350-sysc";
- case MT762X_SOC_MT7620A:
- *idx = 2;
-@@ -48,10 +43,8 @@ static const char *clk_cpu(int *idx)
- *idx = 2;
- return "ralink,mt7620-sysc";
- case MT762X_SOC_MT7628AN:
-- *idx = 1;
- return "ralink,mt7628-sysc";
- case MT762X_SOC_MT7688:
-- *idx = 1;
- return "ralink,mt7688-sysc";
- default:
- *idx = -1;
projects / thirdparty / openwrt.git / commitdiff
