diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-07 20:25:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-07 20:25:47 +0300 |
| commit | c44d243fea5527077a29707bb58ff3270615d4cf (patch) | |
| tree | 7f77f09ee4467af7971ee37b256a64ddb1cc8ebe /net/ipv6/ip6_tunnel.c | |
| parent | 079ba8f46d6cc9e16385402783ca818c4bcc395b (diff) | |
| parent | 105a31925e2d17b766cebcff5d173f469e7b9e52 (diff) | |
| download | linux-c44d243fea5527077a29707bb58ff3270615d4cf.tar.xz | |
Merge v6.12.18linux-rolling-lts
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index b60e13c42bca..48fd53b98972 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -630,8 +630,8 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, } skb_dst_set(skb2, &rt->dst); } else { - if (ip_route_input(skb2, eiph->daddr, eiph->saddr, eiph->tos, - skb2->dev) || + if (ip_route_input(skb2, eiph->daddr, eiph->saddr, + ip4h_dscp(eiph), skb2->dev) || skb_dst(skb2)->dev->type != ARPHRD_TUNNEL6) goto out; } |